colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alex: which needs to be a tool dep so it's a nativeBuildInput

Browse Source 
Also pull it from `buildPackages`, as that is where nativeBuildInputs
come from.
This commit is contained in:
John Ericson 2018-06-25 16:14:40 -04:00 committed by Matthew Bauer
parent 242ca11b03
commit d2f6f527f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -9,7 +9,7 @@
#
# See comment at the top of configuration-nix.nix for more information about this
# distinction.
{ pkgs, haskellLib }:
{ buildPackages, pkgs, haskellLib }:
with haskellLib;
@ -1036,7 +1036,7 @@ self: super: {
# The test suite does not know how to find the 'alex' binary.
alex = overrideCabal super.alex (drv: {
testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
testToolDepends = (drv.testSystemDepends or []) ++ [ buildPackages.which ];
preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
});

4
pkgs/development/haskell-modules/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes
{ buildPackages, pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes
, buildHaskellPackages
, compilerConfig ? (self: super: {})
, packageSetConfig ? (self: super: {})
@ -18,7 +18,7 @@ let
inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes;
};
commonConfiguration = configurationCommon { inherit pkgs haskellLib; };
commonConfiguration = configurationCommon { inherit buildPackages pkgs haskellLib; };
nixConfiguration = configurationNix { inherit pkgs haskellLib; };
extensible-self = makeExtensible