From d2f6f527f40ddacb0af4dac4a931fc68f945720a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 25 Jun 2018 16:14:40 -0400 Subject: [PATCH] alex: `which` needs to be a tool dep so it's a nativeBuildInput Also pull it from `buildPackages`, as that is where nativeBuildInputs come from. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6e582454e9c..39bdfe3fd03 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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"''; }); diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7b512e46da8..5d253cb3c2b 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -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