pyrox.dev
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.
+3
-3
pkgs/development/compilers/ghc/7.0.4-binary.nix
+3
-3
pkgs/development/compilers/ghc/7.0.4-binary.nix
···
74
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1
75
}
76
77
-
ln -s ${libiconv}/lib/libiconv.dylib ghc-7.0.4/utils/ghc-pwd/dist/build/tmp
78
-
ln -s ${libiconv}/lib/libiconv.dylib ghc-7.0.4/utils/hpc/dist/build/tmp
79
-
ln -s ${libiconv}/lib/libiconv.dylib ghc-7.0.4/ghc/stage2/build/tmp
80
81
for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do
82
fix $(find . -type f -name $file)
···
74
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1
75
}
76
77
+
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist/build/tmp
78
+
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist/build/tmp
79
+
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp
80
81
for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do
82
fix $(find . -type f -name $file)
+5
-5
pkgs/development/compilers/ghc/7.4.2-binary.nix
+5
-5
pkgs/development/compilers/ghc/7.4.2-binary.nix
···
79
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1
80
}
81
82
-
ln -s ${libiconv}/lib/libiconv.dylib ghc-7.4.2/utils/ghc-pwd/dist-install/build/tmp
83
-
ln -s ${libiconv}/lib/libiconv.dylib ghc-7.4.2/utils/hpc/dist-install/build/tmp
84
-
ln -s ${libiconv}/lib/libiconv.dylib ghc-7.4.2/ghc/stage2/build/tmp
85
86
for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do
87
fix $(find . -type f -name $file)
···
107
dontBuild = true;
108
109
preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
110
-
mkdir -p $out/lib/ghc-7.4.2
111
mkdir -p $out/bin
112
ln -s ${libiconv}/lib/libiconv.dylib $out/bin
113
-
ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-7.4.2/libiconv.dylib
114
ln -s ${libiconv}/lib/libiconv.dylib utils/ghc-cabal/dist-install/build/tmp
115
'';
116
···
79
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1
80
}
81
82
+
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist-install/build/tmp
83
+
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist-install/build/tmp
84
+
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp
85
86
for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do
87
fix $(find . -type f -name $file)
···
107
dontBuild = true;
108
109
preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
110
+
mkdir -p $out/lib/ghc-${version}
111
mkdir -p $out/bin
112
ln -s ${libiconv}/lib/libiconv.dylib $out/bin
113
+
ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-${version}/libiconv.dylib
114
ln -s ${libiconv}/lib/libiconv.dylib utils/ghc-cabal/dist-install/build/tmp
115
'';
116