From ec8b81615462625338d76f002d92accd6eb4cf6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Oct 2016 21:32:09 +0200 Subject: [PATCH] Extend Haskell generic builder to use new --ipid flag. --- pkgs/development/haskell-modules/generic-builder.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b597532b44..e4fcd09c0e0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -180,6 +180,11 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" + ${optionalString (stdenv.lib.versionOlder "8" ghc.version) '' + ipid=$(echo $(basename "$out") | cut -d- -f1) + configureFlags+=" --ipid=$ipid" + ''} + local inputClosure="" for i in $propagatedNativeBuildInputs $nativeBuildInputs; do findInputs $i inputClosure propagated-native-build-inputs