about summary refs log tree commit diff
path: root/pkgs/lib
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2008-03-06 09:34:36 +0000
committerMichael Raskin <7c6f434c@mail.ru>2008-03-06 09:34:36 +0000
commit003a6d10b55fb0b68db789410a39b073361635d7 (patch)
tree7f983041e52585668e7ff18ccbaccce765a22134 /pkgs/lib
parenta463854cd7562208134ef66ea086aa5b0e8c1f2c (diff)
downloadnixlib-003a6d10b55fb0b68db789410a39b073361635d7.tar
nixlib-003a6d10b55fb0b68db789410a39b073361635d7.tar.gz
nixlib-003a6d10b55fb0b68db789410a39b073361635d7.tar.bz2
nixlib-003a6d10b55fb0b68db789410a39b073361635d7.tar.lz
nixlib-003a6d10b55fb0b68db789410a39b073361635d7.tar.xz
nixlib-003a6d10b55fb0b68db789410a39b073361635d7.tar.zst
nixlib-003a6d10b55fb0b68db789410a39b073361635d7.zip
Added CDDA support to MPlayer
svn path=/nixpkgs/trunk/; revision=10978
Diffstat (limited to 'pkgs/lib')
-rw-r--r--pkgs/lib/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index 20a441b5b433..eaeea3af8c1c 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -23,6 +23,15 @@ rec {
 	else (innerSumArgs f (x // y)));
   sumArgs = f : innerSumArgs f {};
 
+  # Advanced sumArgs version. Hm, twice as slow, I'm afraid.
+  # composedArgs id (x:x//{a="b";}) (x:x//{b=x.a + "c";}) null;
+  # {a="b" ; b="bc";};
+  innerComposedArgs = f : x : y : (if y==null then (f x)
+  	else (if (builtins.isAttrs y) then 
+		(innerComposedArgs f (x//y))
+	else (innerComposedArgs f (y x))));
+  composedArgs = f: innerComposedArgs f {};
+
   # example a = pairMap (x : y : x + y) ["a" "b" "c" "d"];
   # result: ["ab" "cd"]
   innerPairMap = acc: f: l: