Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e277be194390
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e30ecaa916f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 9, 2018

  1. haskell: Fix depending on libs with internal libs on darwin.

    @hamishmack
    hamishmack committed Jan 9, 2018
    Copy the full SHA
    d3eaa5a View commit details

Commits on Jan 12, 2018

  1. Merge pull request #33636 from hamishmack/haskell-internal-libs-darwin2 

    haskell: Fix depending on libs with internal libs on darwin.
    @peti
    peti authored Jan 12, 2018
    Copy the full SHA
    e30ecaa View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/haskell-modules/with-packages-wrapper.nix
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/with-packages-wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ symlinkJoin {
# Clean up the old links that may have been (transitively) included by
# symlinkJoin:
rm -f $dynamicLinksDir/*
for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'|sort -u); do
ln -s $d/*.dylib $dynamicLinksDir
done
for f in $packageConfDir/*.conf; do