From 112c78fa5c1db28cbaaf24f78cd025042ba5de16 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 27 Mar 2008 19:12:14 +0000
Subject: [PATCH] Added JFS utils and XFS progs

svn path=/nixpkgs/trunk/; revision=11313
---
 pkgs/os-specific/linux/jfsutils/1.1.12.nix  | 18 +++++++++++++++
 pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix | 25 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 10 +++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/os-specific/linux/jfsutils/1.1.12.nix
 create mode 100644 pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix

diff --git a/pkgs/os-specific/linux/jfsutils/1.1.12.nix b/pkgs/os-specific/linux/jfsutils/1.1.12.nix
new file mode 100644
index 000000000000..14c9f5152f31
--- /dev/null
+++ b/pkgs/os-specific/linux/jfsutils/1.1.12.nix
@@ -0,0 +1,18 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://jfs.sourceforge.net/project/pub/jfsutils-1.1.12.tar.gz;
+    sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd";
+  };
+
+  buildInputs = [e2fsprogs];
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "jfsutils-" + version;
+  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
new file mode 100644
index 000000000000..fc777d0dbf7a
--- /dev/null
+++ b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
@@ -0,0 +1,25 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs_2.9.7-1.tar.gz;
+    sha256 = "0g4pr1rv4lgc7vab18wiwrcr6jq40fs1krb2vfkgh779p7gf3il7";
+  };
+
+  buildInputs = [libtool gettext e2fsprogs];
+  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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bcfa0989f39..a8643429d7e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3960,6 +3960,11 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
+  jfsUtilsFun = builderDefsPackage (selectVersion ../os-specific/linux/jfsutils "1.1.12") {
+    inherit e2fsprogs;
+  };
+  jfsUtils = jfsUtilsFun null;
+
   kbd = import ../os-specific/linux/kbd {
     inherit fetchurl stdenv bison flex;
   };
@@ -4492,6 +4497,11 @@ let pkgs = rec {
     inherit fetchurl stdenv openssl;
   };
 
+  xfsProgsFun = builderDefsPackage (selectVersion ../os-specific/linux/xfsprogs "2.9.7-1"){
+    inherit libtool gettext e2fsprogs;
+  };
+  xfsProgs = xfsProgsFun null;
+
   xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
     inherit stdenv xlibs expat libdrm;
   };