Fixed log nesting; added Qi.

svn path=/nixpkgs/trunk/; revision=9601
This commit is contained in:
Michael Raskin 2007-11-08 14:34:54 +00:00
parent 2a8bb1725d
commit a8db1746a5
24 changed files with 65 additions and 35 deletions

View file

@ -9,7 +9,6 @@ args: with args;
buildInputs =[(wxGTK null) libogg libvorbis libsndfile libmad pkgconfig gtk
gettext glib];
} null);
with stringsWithDeps;
let
postInstall = FullDepEntry ("
old_rpath=$(patchelf --print-rpath \$out/bin/audacity);

View file

@ -8,7 +8,6 @@ args: with args;
buildInputs = [fftw ladspaH pkgconfig];
configureFlags = [];
} null);
with stringsWithDeps;
let
postInstall = FullDepEntry ("
ensureDir \$out/share/ladspa/

View file

@ -1,5 +1,4 @@
args: with args;
with stringsWithDeps;
let
src =
fetchurl {

View file

@ -20,7 +20,6 @@ args : with args;
++ (lib.optional (args ? sndlib) "--with-midi" )
;
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let preBuild = FullDepEntry ("
cp config.log /tmp/snd-config.log
") [minInit doUnpack];

View file

@ -9,7 +9,6 @@ args : with args;
propagatedBuildInputs = [getopt libxslt];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let
fixPkgconfig = FullDepEntry ("
ensureDir \$out/lib

View file

@ -15,7 +15,6 @@ args : with args;
"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "compizconfig-settings-"+args.version;
builder = writeScript (name + "-builder")

View file

@ -20,7 +20,6 @@ args : with args;
"XORG_DRIVER_PATH" "/nix/store/.*"
]];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let
install = FullDepEntry ("
sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager

View file

@ -9,7 +9,6 @@ args : with args;
[libcompizconfig bcop python pyrex configBackendGConf];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "compizconfig-python-"+args.version;
builder = writeScript (name + "-builder")

View file

@ -10,7 +10,6 @@ args : with args;
configureFlags = [];
forceShare = ["man" "doc" "info" "lib/compizconfig"];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "compizconfig-backend-GConf-"+version;
builder = writeScript (name + "-builder")

View file

@ -9,7 +9,6 @@ args : with args;
[bcop libjpeg gettext pluginsMain];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let
sharePlugins = FullDepEntry ("
ensureDir \$out/share/compiz-plugins

View file

@ -9,7 +9,6 @@ args : with args;
[bcop];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "libcompizconfig-"+version;
builder = writeScript (name + "-builder")

View file

@ -9,7 +9,6 @@ args : with args;
[bcop libjpeg gettext];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let
sharePlugins = FullDepEntry ("
ensureDir \$out/share/compiz-plugins

View file

@ -21,7 +21,6 @@ args : with args;
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
patches = [ ./glx-patch-0.6.2.patch ];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let
postAll = FullDepEntry ("
for i in $out/bin/*; do

View file

@ -8,7 +8,6 @@ args : with args;
buildInputs = [python];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "Pyrex-"+version;
builder = writeScript (name + "-builder")

View file

@ -8,7 +8,6 @@ args : with args;
buildInputs = [];
configureFlags = ["--enable-float --enable-shared"];
} null;
with stringsWithDeps;
stdenv.mkDerivation {
name = "fftw-3.1.2";
builder = writeScript "fftw-3.1.2-builder"

View file

@ -9,7 +9,6 @@ args : with args;
buildInputs = [perl perlXMLParser];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "intltool-0.36.2";
builder = writeScript (name + "-builder")

View file

@ -12,7 +12,6 @@ args : with args;
cd ltrace-*;
";
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
let
preConfigure = FullDepEntry ("
sed -e 's@-o root -g root@@' -i Makefile.in;

View file

@ -8,7 +8,6 @@ args: with args;
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
};
} null);
with stringsWithDeps;
let
preBuild = FullDepEntry "
sed -e '

View file

@ -42,6 +42,8 @@ rec {
(uniqList {inputList = textClosureDupList arg;}));
textClosure = arg: concatStringsSep "\n" (textClosureList arg);
textClosureMap = f: arg: concatStringsSep "\n" (map f (textClosureList arg));
noDepEntry = text : {inherit text;deps = [];};
FullDepEntry = text : deps: {inherit text deps;};
PackEntry = deps: {inherit deps; text="";};

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, pkgconfig, xorgserver, libXi, libXext}:
args: with args;
stdenv.mkDerivation {
name = "synaptics-0.14.6";
@ -7,8 +7,9 @@ stdenv.mkDerivation {
md5 = "1102cd575045640a064ab6f9b1e391af";
};
makeFlags="DESTDIR=\${out} PREFIX=/";
buildInputs = [libX11 pkgconfig xorgserver libXi libXext];
preBuild = "export NIX_CFLAGS_COMPILE=\"\${NIX_CFLAGS_COMPILE} -I${pixman}/include/pixman-1\"";
makeFlags="DESTDIR=\${out} PREFIX=/ ";
buildInputs = [libX11 pkgconfig xorgserver libXi libXext pixman];
meta = {
description = "Driver for synaptics touchpad.";

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl}:
{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth}:
stdenv.mkDerivation {
name = "tightvnc-1.3.9";
@ -9,5 +9,6 @@ stdenv.mkDerivation {
url = mirror://sourceforge/vnc-tight/tightvnc-1.3.9_unixsrc.tar.bz2;
sha256 = "0nij6kyzwxf7nblwd6riwqhzh8b8xwdffpj379zi5y9mcmiwmalr";
};
buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp];
buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp
xauth];
}

View file

@ -700,7 +700,7 @@ rec {
tightvnc = import ../tools/admin/tightvnc {
inherit fetchurl stdenv x11 zlib libjpeg perl;
inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp;
inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp xauth;
};
time = import ../tools/misc/time {
@ -1218,6 +1218,14 @@ rec {
version = "0.9.6";
} null;
QiFun = lib.sumArgs (import ../development/compilers/qi) {
inherit clisp stdenv fetchurl builderDefs unzip;
};
Qi = QiFun {
version = getConfig ["Qi" "version"] "9.1";
} null;
realPerl = import ../development/interpreters/perl {
inherit fetchurl stdenv;
};
@ -4487,7 +4495,7 @@ rec {
synaptics = import ../misc/synaptics {
inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libXi libXext;
inherit (xlibs) libX11 libXi libXext pixman;
inherit (xorg) xorgserver;
};

View file

@ -9,6 +9,7 @@ rec
(if hasSuffixHack ".tar" s then "tar"
else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) then "tbz2"
else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
else (abort "unknown archive type : ${s}"));
minInit = noDepEntry ("
@ -33,9 +34,39 @@ rec
export TZ=UTC
prefix=${if args ? prefix then (toString args.prefix) else "\$out"}
nestingLevel=0
startNest() {
nestingLevel=\$((\$nestingLevel + 1))
echo -en \"\\e[\$1p\"
}
stopNest() {
nestingLevel=\$((\$nestingLevel - 1))
echo -en \"\\e[q\"
}
header() {
startNest \"\$2\"
echo \"\$1\"
}
# Make sure that even when we exit abnormally, the original nesting
# level is properly restored.
closeNest() {
while test \$nestingLevel -gt 0; do
stopNest
done
}
trap \"closeNest\" EXIT
"
else ""));
addInputs = FullDepEntry ("
# Recursively find all build inputs.
findInputs()
@ -53,8 +84,6 @@ rec
echo \$pkg
if test -f \$pkg/nix-support/setup-hook; then
source \$pkg/nix-support/setup-hook
cat \$pkg/nix-support/setup-hook
echo $PATH;
fi
if test -f \$pkg/nix-support/propagated-build-inputs; then
@ -118,14 +147,18 @@ rec
") [minInit];
toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then "
tar xvf ${s}
cd \"\$(tar tf ${s} | head -1 | sed -e 's@/.*@@' )\"
tar xvf '${s}'
cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\"
" else if (archiveType s) == "tgz" then "
tar xvzf ${s}
cd \"\$(tar tzf ${s} | head -1 | sed -e 's@/.*@@' )\"
tar xvzf '${s}'
cd \"\$(tar tzf '${s}' | head -1 | sed -e 's@/.*@@' )\"
" else if (archiveType s) == "tbz2" then "
tar xvjf ${s}
cd \"\$(tar tjf ${s} | head -1 | sed -e 's@/.*@@' )\"
tar xvjf '${s}'
cd \"\$(tar tjf '${s}' | head -1 | sed -e 's@/.*@@' )\"
" else if (archiveType s) == "zip" then "
unzip '${s}'
cd \"$( unzip -lqq '${s}' | tail -1 |
sed -e 's@^\\(\\s\\+[-0-9:]\\+\\)\\{3,3\\}\\s\\+\\([^/]\\+\\)/.*@\\2@' )\"
" else (abort "unknown archive type : ${s}"))+
(if args ? goSrcDir then args.goSrcDir else "")
) [minInit];
@ -210,4 +243,8 @@ rec
replaceInScript = file: l: (concatStringsSep "\n" ((pairMap (replaceScriptVar file) l)));
replaceScripts = l:(concatStringsSep "\n" (pairMap replaceInScript l));
doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) [minInit];
makeNest = x:(if x==minInit.text then x else "startNest\n" + x + "\nstopNest\n");
textClosure = textClosureMap makeNest;
inherit noDepEntry FullDepEntry PackEntry;
}

View file

@ -5,7 +5,6 @@ args : with args;
buildInputs = [];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "${abort "Specify name"}";
builder = writeScript (name + "-builder")