diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-22 13:59:43 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-22 19:53:29 -0400 |
| commit | 17de4355334f450194b0022b9a09f9b13cdeba20 (patch) | |
| tree | a1d21f8c8e15ab77f3c3084a00907fa8c205d114 /pkgs/development/compilers/ghc | |
| parent | d72647bc055842e8bf65443b331f8a88808e5e15 (diff) | |
| download | nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.tar nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.tar.gz nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.tar.bz2 nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.tar.lz nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.tar.xz nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.tar.zst nixlib-17de4355334f450194b0022b9a09f9b13cdeba20.zip | |
ghc prebuilt: Don't hardcode the version in a few more places
This removes noise in the diff, making creating new versions easier. No hashes should be changed.
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/7.0.4-binary.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/7.4.2-binary.nix | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 6140cde4a9ef..a53098937ce8 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1 } - ln -s ${libiconv}/lib/libiconv.dylib ghc-7.0.4/utils/ghc-pwd/dist/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-7.0.4/utils/hpc/dist/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-7.0.4/ghc/stage2/build/tmp + ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist/build/tmp + ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist/build/tmp + ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do fix $(find . -type f -name $file) diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 100bb87768b5..cfbc1e8dd170 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1 } - ln -s ${libiconv}/lib/libiconv.dylib ghc-7.4.2/utils/ghc-pwd/dist-install/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-7.4.2/utils/hpc/dist-install/build/tmp - ln -s ${libiconv}/lib/libiconv.dylib ghc-7.4.2/ghc/stage2/build/tmp + ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist-install/build/tmp + ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist-install/build/tmp + ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do fix $(find . -type f -name $file) @@ -107,10 +107,10 @@ stdenv.mkDerivation rec { dontBuild = true; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p $out/lib/ghc-7.4.2 + mkdir -p $out/lib/ghc-${version} mkdir -p $out/bin ln -s ${libiconv}/lib/libiconv.dylib $out/bin - ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-7.4.2/libiconv.dylib + ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-${version}/libiconv.dylib ln -s ${libiconv}/lib/libiconv.dylib utils/ghc-cabal/dist-install/build/tmp ''; |