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

ghc-head: Put ./boot into commonPreConfigure

Browse Source
This commit is contained in:
Shea Levy 2017-01-06 22:10:29 -05:00
parent c5c7911ac2
commit 845dd121f8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/ghc/head.nix
View File

@ -8,8 +8,12 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
version = "8.1.20170106"; version = "8.1.20170106";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
commonPreConfigure = '' commonPreConfigure = ''
echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID
./boot
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
@ -17,9 +21,8 @@ let
export NIX_LDFLAGS+=" -no_dtrace_dof" export NIX_LDFLAGS+=" -no_dtrace_dof"
''; '';
in stdenv.mkDerivation (rec { in stdenv.mkDerivation (rec {
inherit version; inherit version rev;
name = "ghc-${version}"; name = "ghc-${version}";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";
@ -29,11 +32,7 @@ in stdenv.mkDerivation (rec {
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";
preConfigure = '' preConfigure = commonPreConfigure;
echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID
./boot
'' + commonPreConfigure ;
buildInputs = commonBuildInputs; buildInputs = commonBuildInputs;