diff options
author | Nicholas Clarke <nick@topos.org.uk> | 2017-07-28 17:03:27 +0100 |
---|---|---|
committer | Nicholas Clarke <nick@topos.org.uk> | 2017-09-04 12:35:57 +0100 |
commit | 8c642d593790388030623076722c51ba93d2bd77 (patch) | |
tree | 3dbafb2b11249c4e727bd999be5685629e1236c2 | |
parent | 676362494d54b8ee1c7411a8963aaa72041fa91e (diff) | |
download | nixlib-8c642d593790388030623076722c51ba93d2bd77.tar nixlib-8c642d593790388030623076722c51ba93d2bd77.tar.gz nixlib-8c642d593790388030623076722c51ba93d2bd77.tar.bz2 nixlib-8c642d593790388030623076722c51ba93d2bd77.tar.lz nixlib-8c642d593790388030623076722c51ba93d2bd77.tar.xz nixlib-8c642d593790388030623076722c51ba93d2bd77.tar.zst nixlib-8c642d593790388030623076722c51ba93d2bd77.zip |
Provide hscolour, happy, alex bin to buildInputs.
Use stdenv.lib.getBin instead of `.bin`
-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.1.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 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/halvm/2.4.0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 863f904e4e96..726fad77865f 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 eb8f1dddd19b..943bc8b124b2 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.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 6e47ee92630a..8e800b78d661 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl hscolour sphinx]; + buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index e50a8df7352d..85aca075d863 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 bce51f92c0bc..5b76e9ebea76 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 = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; + commonBuildInputs = [ (stdenv.lib.getBin alex) autoconf automake ghc (stdenv.lib.getBin happy) (stdenv.lib.getBin hscolour) perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 362b4895b7e3..491c014d26d4 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"; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index a7381fa1a146..051e7daaa3eb 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -118,7 +118,7 @@ in mkDerivation (rec { lens optparse-applicative parallel safe shelly split stringsearch syb system-fileio system-filepath tar terminfo text-binary unordered-containers vector wl-pprint-text yaml - alex happy git gnumake autoconf automake libtool patch gmp + (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) git gnumake autoconf automake libtool patch gmp base16-bytestring cryptohash executable-path haddock-api transformers-compat QuickCheck haddock hspec xhtml regex-posix libiconv diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix index 24fffcf603cb..8cbed2a865ec 100644 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in ''; configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ]; - propagatedNativeBuildInputs = [ alex happy ]; + propagatedNativeBuildInputs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) ]; buildInputs = - let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc + let haskellPkgs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) (stdenv.lib.getBin bootPkgs.hscolour) bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc ]; in [ bootPkgs.ghc automake perl git binutils autoconf xen zlib ncurses.dev diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7beafe4ce1ff..d56a713318b8 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -238,7 +238,7 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." export PATH="${ghc}/bin:$PATH" - ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour.bin}/bin:$PATH"} + ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${stdenv.lib.getBin hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir |