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

Add buildLocalCabalWithArgs for providing extra arguments to callPackage

Browse Source
This commit is contained in:
Shea Levy 2014-04-20 22:57:03 -04:00
parent 6b634673f9
commit 5701e4e15a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/haskell-packages.nix
View File

@ -2992,7 +2992,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
# Build a cabal package given a local .cabal file # Build a cabal package given a local .cabal file
buildLocalCabal = src: name: let buildLocalCabalWithArgs = { src, name, args ? {} }: let
cabalExpr = pkgs.stdenv.mkDerivation ({ cabalExpr = pkgs.stdenv.mkDerivation ({
name = "${name}.nix"; name = "${name}.nix";
@ -3008,7 +3008,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
}); });
in callPackage cabalExpr { inherit src; }; in callPackage cabalExpr ({ inherit src; } // args);
buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; };
cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};