diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 13:25:52 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 13:25:52 +0000 |
commit | ccc497f80d4bc74f392beca717ea4781a3a60ddd (patch) | |
tree | ee308e93a0932a4cf46d29ac8d9bbcb68beedb9a /pkgs/lib/customisation.nix | |
parent | 3c824666fd86301494f2a6db3ebf1b2e1277541a (diff) | |
download | nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.gz nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.bz2 nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.lz nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.xz nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.zst nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.zip |
Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
Diffstat (limited to 'pkgs/lib/customisation.nix')
-rw-r--r-- | pkgs/lib/customisation.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 334c8036627..177856e4d0e 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -53,12 +53,12 @@ rec { { override = newArgs: makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); deepOverride = newArgs: - makeOverridable f ((lib.mapAttrs (deepOverride newArgs) origArgs) // newArgs); + makeOverridable f ((lib.mapAttrs (deepOverrider newArgs) origArgs) // newArgs); origArgs = origArgs; }; - deepOverride = newArgs: name: x: if builtins.isAttrs x then ( + deepOverrider = newArgs: name: x: if builtins.isAttrs x then ( if x ? deepOverride then (x.deepOverride newArgs) else if x ? override then (x.override newArgs) else x) else x; |