public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons
2013-04-20 22:19:39 +02:00
parent 2b56b020c7 3bf0d2b960
commit 2ffd0b6dac
49 changed files with 995 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/ghc/wrapper.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, ghc, makeWrapper, coreutils }:
{ stdenv, ghc, makeWrapper, coreutils, forUserEnv ? false }:
let
ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1";
@@ -54,4 +54,11 @@ stdenv.mkDerivation ({
inherit ghc;
inherit (ghc) meta;
ghcVersion = ghc.version;
} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; }))
} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; })
// (stdenv.lib.optionalAttrs forUserEnv {
postFixup= ''
ln -s $ghc/lib $out/lib;
mkdir -p $out/share/doc
ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version}
'';
}))