stdenv-updates: merge updates from 'master' branch

2012-09-11 16:48:41 +02:00
parent 6bc378f584 504e2ad128
commit d5677fe6c7
771 changed files with 14876 additions and 5473 deletions
@@ -23,6 +23,11 @@ let
           ./gnu.patch                # submitted upstream
         ]

+    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
+        [ ./gnu.patch
+          ./kfreebsd-gnu.patch
+        ]
+
    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
  
 in