diff options
| author | Peter Simons <simons@cryp.to> | 2018-03-09 15:06:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-09 15:06:14 +0100 |
| commit | 90b394936b374be2be7da80ef04178f262dff848 (patch) | |
| tree | be2c23c395bf1df7bb5f11366378f1e4a9c456db /pkgs | |
| parent | 0fd204dac3634acdb2299428894d1dbe4a1566d4 (diff) | |
| parent | a90294afe4da78a3a2ed1ac836ff72b9db4da9bd (diff) | |
| download | nixlib-90b394936b374be2be7da80ef04178f262dff848.tar nixlib-90b394936b374be2be7da80ef04178f262dff848.tar.gz nixlib-90b394936b374be2be7da80ef04178f262dff848.tar.bz2 nixlib-90b394936b374be2be7da80ef04178f262dff848.tar.lz nixlib-90b394936b374be2be7da80ef04178f262dff848.tar.xz nixlib-90b394936b374be2be7da80ef04178f262dff848.tar.zst nixlib-90b394936b374be2be7da80ef04178f262dff848.zip | |
Merge pull request #36652 from roberth/cabal2nix-extra-options
haskell.lib.haskellSrc2nix: add extraCabal2nixOptions
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index c793c0e70860..33d56fa8e1ca 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -107,7 +107,7 @@ let inherit packages; }; - haskellSrc2nix = { name, src, sha256 ? null }: + haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { @@ -120,7 +120,7 @@ let installPhase = '' export HOME="$TMP" mkdir -p "$out" - cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" + cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; |