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

Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12655
This commit is contained in:
Michael Raskin
2008-08-19 05:54:09 +00:00
parent b5b68ce414
commit 87ff8d6347
51 changed files with 224 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/dosfstools/2.11deb.nix
+3 -3
View File
@@ -1,10 +1,10 @@
args : with args; with builderDefs {src="";} null;
args : with args; with builderDefs;
let patch =
fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11-2.3.diff.gz;
sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld";
};
localDefs = builderDefs (rec {
localDefs = builderDefs.meta.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz;
@@ -17,7 +17,7 @@ args : with args; with builderDefs {src="";} null;
buildInputs = [];
configureFlags = [];
makeFlags = " PREFIX=$out ";
}) null; /* null is a terminator for sumArgs */
});
in with localDefs;
stdenv.mkDerivation rec {
name = "dosfstools-"+version;
pkgs/tools/misc/relfs/cvs.2008.03.05.nix
+2 -2
View File
@@ -1,6 +1,6 @@
args : with args;
let localDefs = builderDefs {
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
if args ? src then args.src else fetchcvs {
cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
@@ -12,7 +12,7 @@ args : with args;
buildInputs = [ocaml fuse postgresql pcre
e2fsprogs gnomevfs pkgconfig GConf];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
let build = FullDepEntry ("
cd deps
pkgs/tools/misc/rlwrap/0.28.nix
+3 -3
View File
@@ -1,5 +1,5 @@
args : with args; with builderDefs {src="";} null;
let localDefs = builderDefs {
args : with args; with builderDefs;
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;
@@ -8,7 +8,7 @@ args : with args; with builderDefs {src="";} null;
buildInputs = [readline ];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
};
in with localDefs;
stdenv.mkDerivation rec {
name = "rlwrap-"+version;