public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.lib.haskellSrc2nix: add extraCabal2nixOptions

Browse Source
This commit is contained in:
Robert Hensing 2018-03-09 14:47:47 +01:00
parent 6fcf691545
commit a90294afe4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -107,7 +107,7 @@ let
inherit packages; inherit packages;
}; };
haskellSrc2nix = { name, src, sha256 ? null }: haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
let let
sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
in pkgs.buildPackages.stdenv.mkDerivation { in pkgs.buildPackages.stdenv.mkDerivation {
@ -120,7 +120,7 @@ let
installPhase = '' installPhase = ''
export HOME="$TMP" export HOME="$TMP"
mkdir -p "$out" 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"
''; '';
}; };