From 5701e4e15aa5876e0dcfa5079f76a80d9a5afac8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 20 Apr 2014 22:57:03 -0400 Subject: [PATCH] Add buildLocalCabalWithArgs for providing extra arguments to callPackage --- pkgs/top-level/haskell-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cacc9589325..7c241f9e44d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2992,7 +2992,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; # Build a cabal package given a local .cabal file - buildLocalCabal = src: name: let + buildLocalCabalWithArgs = { src, name, args ? {} }: let cabalExpr = pkgs.stdenv.mkDerivation ({ name = "${name}.nix"; @@ -3008,7 +3008,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x LANG = "en_US.UTF-8"; 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 {};