diff options
author | Nicholas Clarke <nick@topos.org.uk> | 2017-10-12 19:39:41 +0100 |
---|---|---|
committer | Nicholas Clarke <nick@topos.org.uk> | 2017-11-27 16:05:22 +0000 |
commit | d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331 (patch) | |
tree | bf470fb62b16304abc3c10f37507ae529d3e77b3 /pkgs/development/compilers/ghc | |
parent | 946ae87414a5c1039a2652814077db35c61f2074 (diff) | |
download | nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.gz nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.bz2 nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.lz nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.xz nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.zst nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.zip |
Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
This reverts commit 89f5d52cf44baec14a7f542a605243777b16e7a5.
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 51274dd60598..af1db1e6dccf 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ]; patches = [ ./relocation.patch ]; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index d573a22e0ae8..22a1016776ee 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index d475e3438b4b..55193f2f3c31 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; - buildInputs = [ ghc perl hscolour sphinx ]; + buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index bcc801c98ea5..7c3b21f33c25 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -10,7 +10,7 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; - + preReleaseName = "ghc-8.2.1"; commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 92ba3f6a46ed..27f706fc1c67 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -11,7 +11,7 @@ let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; + commonBuildInputs = [ ghc perl autoconf automake (stdenv.lib.getBin happy) (stdenv.lib.getBin alex) python3 ]; rev = "14457cf6a50f708eecece8f286f08687791d51f7"; |