diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-08-11 22:29:03 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-08-11 22:29:03 +0000 |
| commit | bbf64219b49c5a5917066c7075cdf200699adddb (patch) | |
| tree | 75f5df3982869d7c86a9443986d3adf6a2fbba6f /pkgs | |
| parent | 130b060d907ce3883838a900e44845c36722a07d (diff) | |
| download | nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.tar nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.tar.gz nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.tar.bz2 nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.tar.lz nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.tar.xz nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.tar.zst nixlib-bbf64219b49c5a5917066c7075cdf200699adddb.zip | |
* More e2fsprogs -> libuuid.
svn path=/nixpkgs/trunk/; revision=16695
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/btrfsprogs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/jfsutils/1.1.12.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/btrfsprogs/default.nix b/pkgs/os-specific/linux/btrfsprogs/default.nix index f06c5192d9eb..c7a8bb58d033 100644 --- a/pkgs/os-specific/linux/btrfsprogs/default.nix +++ b/pkgs/os-specific/linux/btrfsprogs/default.nix @@ -4,7 +4,7 @@ let version = a.lib.attrByPath ["version"] "0.19" a; buildInputs = with a; [ - zlib e2fsprogs acl + zlib libuuid acl ]; in rec { diff --git a/pkgs/os-specific/linux/jfsutils/1.1.12.nix b/pkgs/os-specific/linux/jfsutils/1.1.12.nix index 14c9f5152f31..2d48bfd6e15e 100644 --- a/pkgs/os-specific/linux/jfsutils/1.1.12.nix +++ b/pkgs/os-specific/linux/jfsutils/1.1.12.nix @@ -5,7 +5,7 @@ rec { sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd"; }; - buildInputs = [e2fsprogs]; + buildInputs = [libuuid]; configureFlags = []; /* doConfigure should be specified separately */ diff --git a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix index a5c55bf98a7e..aa1605b71bd6 100644 --- a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix +++ b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix @@ -1,11 +1,11 @@ args : with args; rec { src = fetchurl { - url = [ ftp://oss.sgi.com/projects/xfs/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 ]; + 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 e2fsprogs]; + buildInputs = [libtool gettext libuuid]; configureFlags = []; preConfigure = fullDepEntry ('' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc52a30ab05f..813e9b9cb7fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4690,7 +4690,7 @@ let }; btrfsProgs = builderDefsPackage (import ../os-specific/linux/btrfsprogs) { - inherit e2fsprogs zlib acl; + inherit libuuid zlib acl; }; cpufrequtils = import ../os-specific/linux/cpufrequtils { @@ -4830,7 +4830,7 @@ let }; jfsUtils = builderDefsPackage (selectVersion ../os-specific/linux/jfsutils "1.1.12") { - inherit e2fsprogs; + inherit libuuid; }; kbd = import ../os-specific/linux/kbd { @@ -5595,7 +5595,7 @@ let }; xfsProgs = builderDefsPackage (selectVersion ../os-specific/linux/xfsprogs "2.9.7-1"){ - inherit libtool gettext e2fsprogs; + inherit libtool gettext libuuid; }; xmoto = builderDefsPackage (import ../games/xmoto) { |