Author: urkud
Date: Fri Jan 21 08:25:06 2011
New Revision: 25657
URL: https://svn.nixos.org/websvn/nix/?rev=25657&sc=1
Log:
Make it possible to call 'callPackage function'
Modified:
nixpkgs/trunk/pkgs/lib/customisation.nix
Modified: nixpkgs/trunk/pkgs/lib/customisation.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/customisation.nix Fri Jan 21 08:25:02 2011
(r25656)
+++ nixpkgs/trunk/pkgs/lib/customisation.nix Fri Jan 21 08:25:06 2011
(r25657)
@@ -89,7 +89,7 @@
};
*/
callPackageWith = autoArgs: fn: args:
- let f = import fn; in
+ let f = if builtins.isFunction fn then fn else import fn; in
makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f)
autoArgs) // args);
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
