JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix some packages that broke because libuuid can be null on Darwin.

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2009-10-08 13:07:56 +00:00
parent 0f20924465
commit 55ad6675dc
6 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/jfsutils/1.1.12.nix
View File

@ -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";
};
}

16
pkgs/os-specific/linux/jfsutils/default.nix Normal file
View File

@ -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";
};
}

25
pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
View File

@ -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";
};
}

23
pkgs/os-specific/linux/xfsprogs/default.nix Normal file
View File

@ -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";
};
}

3
pkgs/tools/misc/relfs/cvs.2008.03.05.nix
View File

@ -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")

8
pkgs/top-level/all-packages.nix
View File

@ -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) {