Author: shlevy
Date: Fri Mar 23 03:01:58 2012
New Revision: 33366
URL: https://nixos.org/websvn/nix/?rev=33366&sc=1
Log:
ghc-packages: Darwin's native readlink doesn't support -f
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/wrapper.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/wrapper.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/wrapper.nix Thu Mar 22
22:37:17 2012 (r33365)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/wrapper.nix Fri Mar 23
03:01:58 2012 (r33366)
@@ -1,4 +1,4 @@
-{stdenv, ghc, makeWrapper}:
+{stdenv, ghc, makeWrapper, coreutils}:
stdenv.mkDerivation {
name = "ghc-${ghc.version}-wrapper";
@@ -31,7 +31,7 @@
case "\$arg" in
-package-conf) ;;
*)
- CANONICALIZED="\$(readlink -f "\$arg")"
+ CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin
"${coreutils}/bin/"}}readlink -f "\$arg")"
GHC_PACKAGES_HASH["\$CANONICALIZED"]= ;;
esac
done
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
