From 55ad6675dce412de483137b92140494d18e05850 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Oct 2009 13:07:56 +0000
Subject: [PATCH] * Fix some packages that broke because libuuid can be null on
 Darwin.   buildDefs doesn't like buildInputs containing nulls. * In
 all-packages.nix: xfsProgs -> xfsprogs, jfsUtils -> jfsutils to   match the
 upstream name.

svn path=/nixpkgs/trunk/; revision=17726
---
 pkgs/os-specific/linux/jfsutils/1.1.12.nix  | 18 ---------------
 pkgs/os-specific/linux/jfsutils/default.nix | 16 +++++++++++++
 pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix | 25 ---------------------
 pkgs/os-specific/linux/xfsprogs/default.nix | 23 +++++++++++++++++++
 pkgs/tools/misc/relfs/cvs.2008.03.05.nix    |  3 +++
 pkgs/top-level/all-packages.nix             |  8 +++----
 6 files changed, 46 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/jfsutils/1.1.12.nix
 create mode 100644 pkgs/os-specific/linux/jfsutils/default.nix
 delete mode 100644 pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
 create mode 100644 pkgs/os-specific/linux/xfsprogs/default.nix

diff --git a/pkgs/os-specific/linux/jfsutils/1.1.12.nix b/pkgs/os-specific/linux/jfsutils/1.1.12.nix
deleted file mode 100644
index 2d48bfd6e15..00000000000
--- a/pkgs/os-specific/linux/jfsutils/1.1.12.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://jfs.sourceforge.net/project/pub/jfsutils-1.1.12.tar.gz;
-    sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd";
-  };
-
-  buildInputs = [libuuid];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "jfsutils-" + version;
-  meta = {
-    description = "IBM JFS utilities";
-  };
-}
diff --git a/pkgs/os-specific/linux/jfsutils/default.nix b/pkgs/os-specific/linux/jfsutils/default.nix
new file mode 100644
index 00000000000..79a9fad0e79
--- /dev/null
+++ b/pkgs/os-specific/linux/jfsutils/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, libuuid }:
+
+stdenv.mkDerivation rec {
+  name = "jfsutils-1.1.12";
+
+  src = fetchurl {
+    url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz";
+    sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd";
+  };
+
+  buildInputs = [ libuuid ];
+
+  meta = {
+    description = "IBM JFS utilities";
+  };
+}
diff --git a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
deleted file mode 100644
index aa1605b71bd..00000000000
--- a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = [ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs_2.9.7-1.tar.gz http://ftp.lfs-matrix.org/pub/blfs/svn/x/xfsprogs_2.9.7-1.tar.gz ];
-    sha256 = "0g4pr1rv4lgc7vab18wiwrcr6jq40fs1krb2vfkgh779p7gf3il7";
-  };
-
-  buildInputs = [libtool gettext libuuid];
-  configureFlags = [];
-
-  preConfigure = fullDepEntry (''
-    sp_path=$(echo $PATH | sed -e 's/:/ /g');
-    sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure
-    sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
-  name = "xfsprogs-" + version;
-  meta = {
-    description = "SGI XFS utilities";
-  };
-}
-  
diff --git a/pkgs/os-specific/linux/xfsprogs/default.nix b/pkgs/os-specific/linux/xfsprogs/default.nix
new file mode 100644
index 00000000000..3487867ee75
--- /dev/null
+++ b/pkgs/os-specific/linux/xfsprogs/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libtool, gettext, libuuid }:
+
+stdenv.mkDerivation {
+  name = "xfsprogs-2.9.7-1";
+
+  src = fetchurl {
+    urls = [ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs_2.9.7-1.tar.gz http://ftp.lfs-matrix.org/pub/blfs/svn/x/xfsprogs_2.9.7-1.tar.gz ];
+    sha256 = "0g4pr1rv4lgc7vab18wiwrcr6jq40fs1krb2vfkgh779p7gf3il7";
+  };
+
+  buildInputs = [libtool gettext libuuid];
+
+  preConfigure =
+    ''
+      sp_path=$(echo $PATH | sed -e 's/:/ /g');
+      sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure
+      sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure
+    '';
+
+  meta = {
+    description = "SGI XFS utilities";
+  };
+}
diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
index b5abe2eb6e0..43b3b9e27b8 100644
--- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
+++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
@@ -39,6 +39,9 @@ args : with args;
 		") ["minInit" "doUnpack" "addInputs"];
 	};
 	in with localDefs;
+
+assert args.libuuid != null;
+        
 stdenv.mkDerivation rec {
 	name = "relfs-"+version;
 	builder = writeScript (name + "-builder")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e841648e3d..a6084d4cb4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5252,8 +5252,8 @@ let
     inherit boost;
   };
 
-  jfsUtils = builderDefsPackage (selectVersion ../os-specific/linux/jfsutils "1.1.12") {
-    inherit libuuid;
+  jfsutils = import ../os-specific/linux/jfsutils/default.nix {
+    inherit fetchurl stdenv libuuid;
   };
 
   kbd = import ../os-specific/linux/kbd {
@@ -6081,8 +6081,8 @@ let
     inherit fetchurl stdenv qt4 imagemagick inkscape;
   };
 
-  xfsProgs = builderDefsPackage (selectVersion ../os-specific/linux/xfsprogs "2.9.7-1"){
-    inherit libtool gettext libuuid;
+  xfsprogs = import ../os-specific/linux/xfsprogs/default.nix {
+    inherit fetchurl stdenv libtool gettext libuuid;
   };
 
   xmoto = builderDefsPackage (import ../games/xmoto) {