Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkgs/development/haskell-modules/generic-builder.nix
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,6 @@ let

makeGhcOptions = opts: lib.concatStringsSep " " (map (opt: "--ghc-option=${opt}") opts);

buildFlagsString = optionalString (buildFlags != [ ]) (" " + concatStringsSep " " buildFlags);

defaultConfigureFlags = [
"--verbose"
"--prefix=$out"
Expand Down Expand Up @@ -735,7 +733,7 @@ lib.fix (

# Cabal takes flags like `--configure-option=--host=...` instead
configurePlatforms = [ ];
inherit configureFlags;
inherit configureFlags buildFlags;

# Note: the options here must be always added, regardless of whether the
# package specifies `hardeningDisable`.
Expand Down Expand Up @@ -769,7 +767,7 @@ lib.fix (
find dist/build -exec touch -d '1970-01-01T00:00:00Z' {} +
''
+ ''
${setupCommand} build ${buildTarget}${buildFlagsString}
${setupCommand} build ${buildTarget} $buildFlags
runHook postBuild
'';

Expand Down
Loading