movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config

Browse source 
Namely, allow {pkgs}: { packageOverrides = p: ...; };

svn path=/nixos/trunk/; revision=29180
This commit is contained in:
Yury G. Kudryashov 2011-09-11 12:41:47 +00:00
parent 9a096c9ee7
commit c56a8456ed
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/misc/nixpkgs.nix
View file

@ -11,7 +11,11 @@ let
then f x then f x
else f; else f;
mergeConfig = lhs: rhs: mergeConfig = lhs_: rhs_:
let
lhs = optCall lhs_ { inherit pkgs; };
rhs = optCall rhs_ { inherit pkgs; };
in
lhs // rhs // lhs // rhs //
optionalAttrs (lhs ? packageOverrides) { optionalAttrs (lhs ? packageOverrides) {
packageOverrides = pkgs: packageOverrides = pkgs: