diff options
| author | figsoda <figsoda@pm.me> | 2023-05-31 16:19:37 -0400 |
|---|---|---|
| committer | figsoda <figsoda@pm.me> | 2023-05-31 19:21:19 -0400 |
| commit | c12654760c29c26407fc7f19db76339f256cd85e (patch) | |
| tree | 1092df57862bfc8ef7379b2b0eb1402c8d4e025d /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 138d6b446388e85f3f7d8c0d6661a46519aa3530 (diff) | |
haskellPackages.mkDerivation: small clean up
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 207025d98d713..53ba217ed19bc 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -7,7 +7,7 @@ let isCross = stdenv.buildPlatform != stdenv.hostPlatform; inherit (buildPackages) fetchurl removeReferencesTo - pkg-config coreutils gnugrep gnused glibcLocales; + pkg-config coreutils gnugrep glibcLocales; in { pname @@ -246,11 +246,11 @@ let "--ghc-options=-haddock" ]; - postPhases = optional doInstallIntermediates [ "installIntermediatesPhase" ]; + postPhases = optional doInstallIntermediates "installIntermediatesPhase"; setupCompileFlags = [ (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") - (optionalString enableParallelBuilding (parallelBuildingFlags)) + (optionalString enableParallelBuilding parallelBuildingFlags) "-threaded" # https://github.com/haskell/cabal/issues/2398 "-rtsopts" # allow us to pass RTS flags to the generated Setup executable ]; @@ -698,7 +698,7 @@ stdenv.mkDerivation ({ lib.optionals (!isCross) setupHaskellDepends); ghcCommandCaps = lib.toUpper ghcCommand'; - in stdenv.mkDerivation ({ + in stdenv.mkDerivation { inherit name shellHook; depsBuildBuild = lib.optional isCross ghcEnvForBuild; @@ -718,7 +718,7 @@ stdenv.mkDerivation ({ "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}"; - }); + }; env = envFunc { }; |