[Nix-commits] SVN commit: nix - r27343 - hydra-config/gnu/trunk/glibc

[Ludovic Courtès]

Author: ludo
Date: Sat Jun  4 21:35:32 2011
New Revision: 27343
URL: https://svn.nixos.org/websvn/nix/?rev=27343&sc=1

Log:
glibc: Expect an optional `hurdPatches' parameter.

Modified:
   hydra-config/gnu/trunk/glibc/release.nix

Modified: hydra-config/gnu/trunk/glibc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/glibc/release.nix    Sat Jun  4 10:53:07 2011        
(r27342)
+++ hydra-config/gnu/trunk/glibc/release.nix    Sat Jun  4 21:35:32 2011        
(r27343)
@@ -15,7 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 { nixpkgs ? ../../nixpkgs
-, glibcHurd ? null }:
+, glibcHurd ? false }:
 
 let
   meta = {
@@ -175,9 +175,10 @@
   jobs = rec {
 
     tarball =
-      { glibcSrc ? { outPath = /data/src/glibc; } }:
+      { glibcSrc ? { outPath = /data/src/glibc; }
+      , hurdPatches ? false }:
 
-      releaseTools.sourceTarball {
+      releaseTools.sourceTarball ({
        name = "glibc-tarball";
        src = glibcSrc;
 
@@ -219,7 +220,21 @@
           '';
 
         inherit meta succeedOnFailure keepBuildDirectory;
-      };
+      }
+
+      //
+
+      (if hurdPatches != false
+       then {
+         postPatch =
+           '' for p in ${hurdPatches}/[0-9]*.patch
+              do
+                echo "applying patch \`$p'..."
+                patch --batch -p1 < $p || exit 1
+              done
+           '';
+       }
+       else { }));
 
     build =
       # Native builds.
@@ -274,7 +289,7 @@
 
   //
 
-  (if glibcHurd != null
+  (if glibcHurd != false
    then { inherit hurd_patches; }
    else { });
 
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits