Make it possible to call 'callPackage function'
svn path=/nixpkgs/trunk/; revision=25657
This commit is contained in:
parent
08abc174f6
commit
e76aee9d2f
|
@ -89,7 +89,7 @@ rec {
|
||||||
};
|
};
|
||||||
*/
|
*/
|
||||||
callPackageWith = autoArgs: fn: args:
|
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);
|
makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) autoArgs) // args);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue