Author: rob
Date: Tue Jan  4 19:10:04 2011
New Revision: 25398
URL: https://svn.nixos.org/websvn/nix/?rev=25398&sc=1

Log:
libidn/release.nix: remove dependency on texlive for build jobs

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

Modified: hydra-config/gnu/trunk/libidn/release.nix
==============================================================================
--- hydra-config/gnu/trunk/libidn/release.nix   Tue Jan  4 16:53:21 2011        
(r25397)
+++ hydra-config/gnu/trunk/libidn/release.nix   Tue Jan  4 19:10:04 2011        
(r25398)
@@ -45,7 +45,7 @@
   };
 
   buildInputsFrom = pkgs: with pkgs;
-    [ pkgconfig perl texLive
+    [ pkgconfig perl 
       help2man docbook_xsl docbook_xml_dtd_412
       libxml2 /* for the setup hook */
     ]
@@ -56,7 +56,7 @@
   jobs = {
 
     tarball =
-      { libidnSrc }:
+      { libidnSrc ? { outPath = ../../libidn ; rev = 1234; } }:
 
       pkgs.releaseTools.sourceTarball {
        name = "libidn-tarball";
@@ -106,7 +106,7 @@
        buildInputs = (buildInputsFrom pkgs)
           ++ (with pkgs;
                [ autoconf automake111x libtool gettext_0_17
-                git texinfo gperf gengetopt transfig
+                git texinfo gperf gengetopt transfig texLive
                  ghostscript # for `fig2dev'
                  cvs # for `autopoint'
               ]);
@@ -115,7 +115,7 @@
       };
 
     build =
-      { tarball, system }:
+      { tarball ? jobs.tarball {}, system ? "x86_64-linux"}:
 
       let pkgs = import nixpkgs { inherit system; };
       in
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to