From 9381f1a419f1165b47a1ffe20fb3eeb0fee641b3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Aug 2011 08:00:55 +0000 Subject: [PATCH] ghc-7.0.4-binary.nix: don't wrap the binaries on darwin ghc-7.0.4 fails at configure with the wrapped binaries and builds fine with the unwrapped binaries. svn path=/nixpkgs/trunk/; revision=28868 --- .../compilers/ghc/7.0.4-binary.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index c9e8e6a332bc..e696ddaf9ceb 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -83,26 +83,7 @@ stdenv.mkDerivation rec { # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so # that the executables work with no special setup. postInstall = - (if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A - ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP - ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP - # !!! fix this - - mv $out/bin $out/bin-orig - mkdir $out/bin - for i in $(cd $out/bin-orig && ls); do - echo "#! $SHELL -e" >> $out/bin/$i - echo "DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \"\$@\"" >> $out/bin/$i - chmod +x $out/bin/$i - done - '' else "") - + - '' - # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way - # sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf - # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc