diff options
| author | Peter Simons <simons@cryp.to> | 2017-09-06 09:40:01 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-09-06 10:19:18 +0200 |
| commit | 89f5d52cf44baec14a7f542a605243777b16e7a5 (patch) | |
| tree | 64018c5ac3fa02da278b0dcba3983d0d327013e9 /pkgs/development/compilers/ghc/8.2.1.nix | |
| parent | f2a76b6c292866e887684a2e7cf0b1e75ffb80cf (diff) | |
| download | nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.gz nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.bz2 nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.lz nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.xz nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.tar.zst nixlib-89f5d52cf44baec14a7f542a605243777b16e7a5.zip | |
Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f254844150d05d34150a975e6479b883d409, reversing
changes made to 7f8ff024372f985e96b438fa5591d9b43fc6e7bd. These changes broke
the ghcWithPackages wrapper:
nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
/nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
(no packages)
Diffstat (limited to 'pkgs/development/compilers/ghc/8.2.1.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.1.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 5b76e9ebea76..bce51f92c0bc 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -11,7 +11,7 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; preReleaseName = "ghc-8.2.1"; - commonBuildInputs = [ (stdenv.lib.getBin alex) autoconf automake ghc (stdenv.lib.getBin happy) (stdenv.lib.getBin hscolour) perl python3 sphinx ]; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' |