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

FullDepEntry -> fullDepEntry, PackEntry -> packEntry

Browse Source 
svn path=/nixpkgs/trunk/; revision=15662
This commit is contained in:
Marc Weber
2009-05-19 23:25:58 +00:00
parent 1500252e6f
commit 52647ea3b0
102 changed files with 177 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/ladspa-plugins/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ args: with args;
}; };
in with localDefs; in with localDefs;
let let
postInstall = FullDepEntry (" postInstall = fullDepEntry ("
ensureDir \$out/share/ladspa/ ensureDir \$out/share/ladspa/
ln -s \$out/lib/ladspa \$out/share/ladspa/lib ln -s \$out/lib/ladspa \$out/share/ladspa/lib
") [minInit defEnsureDir]; ") [minInit defEnsureDir];
pkgs/applications/audio/ladspa-plugins/ladspah.nix
+1 -1
View File
@@ -12,7 +12,7 @@ in
}; };
in with localDefs; in with localDefs;
let let
copyFile = FullDepEntry (" copyFile = fullDepEntry ("
ensureDir \$out/include ensureDir \$out/include
cp ${src} \$out/include/ladspa.h cp ${src} \$out/include/ladspa.h
") [minInit defEnsureDir]; ") [minInit defEnsureDir];
pkgs/applications/audio/snd/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "9.4" args; version = lib.getAttr ["version"] "9.4" args;
buildInputs = with args; [gtk glib pkgconfig buildInputs = with args; [gtk glib pkgconfig
@@ -38,14 +38,14 @@ rec {
phaseNames = ["doConfigure" "preBuild" "makeDocsWork" phaseNames = ["doConfigure" "preBuild" "makeDocsWork"
"doMakeInstall" "doForceShare"]; "doMakeInstall" "doForceShare"];
makeDocsWork = FullDepEntry '' makeDocsWork = fullDepEntry ''
# hackish way to make html docs work # hackish way to make html docs work
h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h" h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
patch -p1 < ${./doc.patch} patch -p1 < ${./doc.patch}
sed "s@HTML-DIR@$h@" -i index.scm snd-help.c sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
'' ["defEnsureDir"]; '' ["defEnsureDir"];
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
cp config.log /tmp/snd-config.log cp config.log /tmp/snd-config.log
export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11" export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
pkgs/applications/graphics/xaos/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = a.FullDepEntry ('' preConfigure = a.fullDepEntry (''
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
ensureDir $out/share/locale ensureDir $out/share/locale
'') ["doUnpack" "minInit" "defEnsureDir"]; '') ["doUnpack" "minInit" "defEnsureDir"];
pkgs/applications/graphics/xscreensaver/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec {
}); });
in with localDefs; in with localDefs;
let let
preConfigure = FullDepEntry (" preConfigure = fullDepEntry ("
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+ sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
"-i driver/Makefile.in po/Makefile.in.in; "-i driver/Makefile.in po/Makefile.in.in;
") ["minInit" "doUnpack"]; ") ["minInit" "doUnpack"];
pkgs/applications/misc/kiwixbuilder/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ args : with args; with builderDefs {src="";} null;
}; };
buildInputs = [glib zlib]; buildInputs = [glib zlib];
configureFlags = [" --prefix=$out "]; configureFlags = [" --prefix=$out "];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ ' export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ '
export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 ' export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 '
sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure
pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+2 -2
View File
@@ -17,11 +17,11 @@ rec {
configureFlags = []; configureFlags = [];
makeFlags = ["linux" "prefix=" "root=$out"]; makeFlags = ["linux" "prefix=" "root=$out"];
preBuild = a.FullDepEntry('' preBuild = a.fullDepEntry(''
sed -e s@/usr/@"$out/"@g -i mozplugger.c sed -e s@/usr/@"$out/"@g -i mozplugger.c
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];
postInstall = a.FullDepEntry('' postInstall = a.fullDepEntry(''
ensureDir $out/share/${name}/plugin ensureDir $out/share/${name}/plugin
ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
'') ["doMakeInstall" "minInit" "defEnsureDir"]; '') ["doMakeInstall" "minInit" "defEnsureDir"];
pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
+2 -2
View File
@@ -30,7 +30,7 @@ rec {
+ " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include" + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
+ " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl"; + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
export echo=echo export echo=echo
'') []; '') [];
@@ -45,7 +45,7 @@ rec {
homepage = http://funpidgin.sf.net; homepage = http://funpidgin.sf.net;
}; };
} // (if externalPurple2 then { } // (if externalPurple2 then {
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2 ensureDir $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; } '') ["minInit" "defEnsureDir"]; }
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+2 -2
View File
@@ -30,7 +30,7 @@ rec {
+ " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include" + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
+ " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl"; + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
export echo=echo export echo=echo
'') []; '') [];
@@ -45,7 +45,7 @@ rec {
homepage = http://funpidgin.sf.net; homepage = http://funpidgin.sf.net;
}; };
} // (if externalPurple2 then { } // (if externalPurple2 then {
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2 ensureDir $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; } '') ["minInit" "defEnsureDir"]; }
pkgs/applications/networking/instant-messengers/gajim/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ rec {
inherit buildInputs; inherit buildInputs;
configureFlags = []; configureFlags = [];
preConfigure = a.FullDepEntry ('' preConfigure = a.fullDepEntry (''
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0"
sed -e '/-L[$]x_libraries/d' -i configure sed -e '/-L[$]x_libraries/d' -i configure
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
+2 -2
View File
@@ -11,7 +11,7 @@ rec {
"PREFIX=$out" "PREFIX=$out"
]; ];
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
ensureDir $out/bin ensureDir $out/bin
ln -s $(which convert) $out/bin ln -s $(which convert) $out/bin
ln -s $(which xelatex) $out/bin ln -s $(which xelatex) $out/bin
@@ -25,7 +25,7 @@ rec {
sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h
'') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/lib ensureDir $out/lib
ensureDir $out/share/pidgin-latex ensureDir $out/share/pidgin-latex
ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex
pkgs/applications/networking/p2p/ldcpp/1.0.3.nix
+1 -1
View File
@@ -9,7 +9,7 @@ args : with args; with builderDefs;
buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
openssl libX11]; openssl libX11];
configureFlags = []; configureFlags = [];
doScons = FullDepEntry ('' doScons = fullDepEntry (''
ensureDir $out ensureDir $out
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
scons PREFIX=$out scons PREFIX=$out
pkgs/applications/science/geometry/drgeo/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doPreBuild" "doMakeInstall"]; phaseNames = ["doConfigure" "doPreBuild" "doMakeInstall"];
doPreBuild = FullDepEntry ('' doPreBuild = fullDepEntry (''
cp drgeo.desktop.in drgeo.desktop cp drgeo.desktop.in drgeo.desktop
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
pkgs/applications/version-management/viewmtn/0.10.nix
+1 -1
View File
@@ -18,7 +18,7 @@ rec {
(pythonWrapperArguments + preservePathWrapperArguments)) (pythonWrapperArguments + preservePathWrapperArguments))
]; ];
doInstall = FullDepEntry ('' doInstall = fullDepEntry (''
for i in dot mtn highlight; do for i in dot mtn highlight; do
sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example
done done
pkgs/applications/virtualization/qemu/linux-img/0.2.nix
+1 -1
View File
@@ -11,7 +11,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
doCopy = FullDepEntry (" doCopy = fullDepEntry ("
ensureDir \$out/share/qemu-images ensureDir \$out/share/qemu-images
cp linux-${version}.img \$out/share/qemu-images/ cp linux-${version}.img \$out/share/qemu-images/
") [minInit doUnpack defEnsureDir]; ") [minInit doUnpack defEnsureDir];
pkgs/applications/virtualization/xen/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "3.3.0" args; version = lib.getAttr ["version"] "3.3.0" args;
_buildInputs = with args; [ _buildInputs = with args; [
@@ -23,10 +23,10 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["makeTools" "makeXen"]; phaseNames = ["makeTools" "makeXen"];
makeTools = FullDepEntry (''make -C tools install PREFIX=$out '') makeTools = fullDepEntry (''make -C tools install PREFIX=$out '')
["minInit" "addInputs" "doUnpack"]; ["minInit" "addInputs" "doUnpack"];
makeXen = FullDepEntry (''make -C xen install PREFIX=$out '') makeXen = fullDepEntry (''make -C xen install PREFIX=$out '')
["minInit" "addInputs" "doUnpack"]; ["minInit" "addInputs" "doUnpack"];
name = "xen-" + version; name = "xen-" + version;
pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix
+2 -2
View File
@@ -11,11 +11,11 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
fixPkgconfig = FullDepEntry (" fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
fixInterpreter = FullDepEntry (" fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall]; ") [minInit doMakeInstall];
in in
pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix
+2 -2
View File
@@ -11,11 +11,11 @@ args : with args;
} ; } ;
in with localDefs; in with localDefs;
let let
fixPkgconfig = FullDepEntry (" fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
fixInterpreter = FullDepEntry (" fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall]; ") [minInit doMakeInstall];
in in
pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
+2 -2
View File
@@ -11,11 +11,11 @@ args : with args;
} ; } ;
in with localDefs; in with localDefs;
let let
fixPkgconfig = FullDepEntry (" fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
fixInterpreter = FullDepEntry (" fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall]; ") [minInit doMakeInstall];
in in
pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix
+1 -1
View File
@@ -22,7 +22,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
install = FullDepEntry (" install = fullDepEntry ("
sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager
sed -e '/Checking for non power of two support: /areturn 0' -i compiz-manager sed -e '/Checking for non power of two support: /areturn 0' -i compiz-manager
sed -e '/^\s*$/aPATH=\$PATH:${xvinfo}/bin:${xdpyinfo}/bin' -i compiz-manager sed -e '/^\s*$/aPATH=\$PATH:${xvinfo}/bin:${xdpyinfo}/bin' -i compiz-manager
pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix
+2 -2
View File
@@ -11,11 +11,11 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
fixIncludes = FullDepEntry (" fixIncludes = fullDepEntry ("
sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/group/group-internal.h; sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/group/group-internal.h;
sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/scalefilter/scalefilter.c; sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/scalefilter/scalefilter.c;
") [minInit doUnpack]; ") [minInit doUnpack];
pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix
+2 -2
View File
@@ -11,11 +11,11 @@ args : with args;
} ; } ;
in with localDefs; in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
fixIncludes = FullDepEntry (" fixIncludes = fullDepEntry ("
sed -e 's@#include <compiz-text.h>@#include <compiz/compiz-text.h>@' -i src/group/group-internal.h; sed -e 's@#include <compiz-text.h>@#include <compiz/compiz-text.h>@' -i src/group/group-internal.h;
sed -e 's@#include <compiz-text.h>@#include <compiz/compiz-text.h>@' -i src/scalefilter/scalefilter.c; sed -e 's@#include <compiz-text.h>@#include <compiz/compiz-text.h>@' -i src/scalefilter/scalefilter.c;
sed -e 's@#include <compiz-mousepoll.h>@#include <compiz/compiz-mousepoll.h>@' -i src/showmouse/showmouse.c; sed -e 's@#include <compiz-mousepoll.h>@#include <compiz/compiz-mousepoll.h>@' -i src/showmouse/showmouse.c;
pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
+2 -2
View File
@@ -11,11 +11,11 @@ args : with args;
} ; } ;
in with localDefs; in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
fixIncludes = FullDepEntry ('' fixIncludes = fullDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz"
'') [minInit doUnpack]; '') [minInit doUnpack];
in in
pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix
+1 -1
View File
@@ -11,7 +11,7 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix
+1 -1
View File
@@ -11,7 +11,7 @@ args : with args;
} ; } ;
in with localDefs; in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
+1 -1
View File
@@ -11,7 +11,7 @@ args : with args;
} ; } ;
in with localDefs; in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir]; ") [minInit doMakeInstall defEnsureDir];
pkgs/applications/window-managers/compiz/0.6.2.nix
+1 -1
View File
@@ -24,7 +24,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
postAll = FullDepEntry (" postAll = fullDepEntry ("
for i in $out/bin/*; do for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done done
pkgs/applications/window-managers/compiz/0.7.8.nix
+1 -1
View File
@@ -25,7 +25,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
postAll = FullDepEntry (" postAll = fullDepEntry ("
for i in $out/bin/*; do for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done done
pkgs/applications/window-managers/compiz/0.8.0.nix
+1 -1
View File
@@ -24,7 +24,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
postAll = FullDepEntry (" postAll = fullDepEntry ("
for i in $out/bin/*; do for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done done
pkgs/applications/window-managers/stumpwm/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@ let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
noDepEntry = args.noDepEntry; noDepEntry = args.noDepEntry;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
buildInputs = lib.attrVals ["clisp" "texinfo"] args; buildInputs = lib.attrVals ["clisp" "texinfo"] args;
version = lib.getAttr ["version"] "0.9.4.1" args; version = lib.getAttr ["version"] "0.9.4.1" args;
@@ -22,7 +22,7 @@ rec {
export HOME="$NIX_BUILD_TOP"; export HOME="$NIX_BUILD_TOP";
''); '');
installation = FullDepEntry ('' installation = fullDepEntry (''
ensureDir $out/bin ensureDir $out/bin
ensureDir $out/share/stumpwm/doc ensureDir $out/share/stumpwm/doc
ensureDir $out/share/info ensureDir $out/share/info
pkgs/build-support/builder-defs/builder-defs.nix
+28 -28
View File
@@ -34,7 +34,7 @@ args: with args; with stringsWithDeps; with lib;
else (abort "unknown archive type : ${s}")); else (abort "unknown archive type : ${s}"));
defAddToSearchPath = FullDepEntry (" defAddToSearchPath = fullDepEntry ("
addToSearchPathWithCustomDelimiter() { addToSearchPathWithCustomDelimiter() {
local delimiter=\$1 local delimiter=\$1
local varName=\$2 local varName=\$2
@@ -85,7 +85,7 @@ args: with args; with stringsWithDeps; with lib;
trap \"closeNest\" EXIT trap \"closeNest\" EXIT
"); ");
minInit = FullDepEntry (" minInit = fullDepEntry ("
set -e set -e
NIX_GCC=${stdenv.gcc} NIX_GCC=${stdenv.gcc}
export SHELL=${stdenv.shell} export SHELL=${stdenv.shell}
@@ -113,7 +113,7 @@ args: with args; with stringsWithDeps; with lib;
" "
else "")) ["defNest" "defAddToSearchPath"]; else "")) ["defNest" "defAddToSearchPath"];
addInputs = FullDepEntry (" addInputs = fullDepEntry ("
# Recursively find all build inputs. # Recursively find all build inputs.
findInputs() findInputs()
{ {
@@ -179,7 +179,7 @@ args: with args; with stringsWithDeps; with lib;
PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH
") ["minInit"]; ") ["minInit"];
defEnsureDir = FullDepEntry (" defEnsureDir = fullDepEntry ("
# Ensure that the given directories exists. # Ensure that the given directories exists.
ensureDir() { ensureDir() {
local dir local dir
@@ -189,7 +189,7 @@ args: with args; with stringsWithDeps; with lib;
} }
") ["minInit"]; ") ["minInit"];
toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then " toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then "
tar xvf '${s}' tar xvf '${s}'
cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\" cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\"
" else if (archiveType s) == "tgz" then " " else if (archiveType s) == "tgz" then "
@@ -236,16 +236,16 @@ args: with args; with stringsWithDeps; with lib;
configureCommand = getAttr ["configureCommand"] "./configure" args; configureCommand = getAttr ["configureCommand"] "./configure" args;
doConfigure = FullDepEntry (" doConfigure = fullDepEntry ("
${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags} ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags}
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
doIntltool = FullDepEntry (" doIntltool = fullDepEntry ("
mkdir -p config mkdir -p config
intltoolize --copy --force intltoolize --copy --force
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
doAutotools = FullDepEntry (" doAutotools = fullDepEntry ("
mkdir -p config mkdir -p config
libtoolize --copy --force libtoolize --copy --force
aclocal --force aclocal --force
@@ -255,17 +255,17 @@ args: with args; with stringsWithDeps; with lib;
autoconf autoconf
")["minInit" "addInputs" "doUnpack"]; ")["minInit" "addInputs" "doUnpack"];
doMake = FullDepEntry (" doMake = fullDepEntry ("
make ${toString makeFlags} make ${toString makeFlags}
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
doUnpack = toSrcDir (toString src); doUnpack = toSrcDir (toString src);
installPythonPackage = FullDepEntry (" installPythonPackage = fullDepEntry ("
python setup.py install --prefix=\"\$prefix\" python setup.py install --prefix=\"\$prefix\"
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
doPythonConfigure = FullDepEntry ('' doPythonConfigure = fullDepEntry (''
pythonVersion=$(toPythonPath "$prefix") pythonVersion=$(toPythonPath "$prefix")
pythonVersion=''${pythonVersion#*/lib/python} pythonVersion=''${pythonVersion#*/lib/python}
pythonVersion=''${pythonVersion%%/site-packages} pythonVersion=''${pythonVersion%%/site-packages}
@@ -275,11 +275,11 @@ args: with args; with stringsWithDeps; with lib;
python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags} python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags}
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
doMakeInstall = FullDepEntry (" doMakeInstall = fullDepEntry ("
make ${toString (getAttr ["makeFlags"] "" args)} "+ make ${toString (getAttr ["makeFlags"] "" args)} "+
"${toString (getAttr ["installFlags"] "" args)} install") ["doMake"]; "${toString (getAttr ["installFlags"] "" args)} install") ["doMake"];
doForceShare = FullDepEntry (" doForceShare = fullDepEntry ("
ensureDir \"\$prefix/share\" ensureDir \"\$prefix/share\"
for d in ${toString forceShare}; do for d in ${toString forceShare}; do
if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then
@@ -289,7 +289,7 @@ args: with args; with stringsWithDeps; with lib;
done; done;
") ["minInit" "defEnsureDir"]; ") ["minInit" "defEnsureDir"];
doForceCopy = FullDepEntry ('' doForceCopy = fullDepEntry (''
name="$(basename $out)" name="$(basename $out)"
name="''${name#*-}" name="''${name#*-}"
ensureDir "$prefix/share/$name" ensureDir "$prefix/share/$name"
@@ -306,7 +306,7 @@ args: with args; with stringsWithDeps; with lib;
toPatchCommand = s: "cat ${s} | patch ${toString patchFlags}"; toPatchCommand = s: "cat ${s} | patch ${toString patchFlags}";
doPatch = FullDepEntry (concatStringsSep ";" doPatch = fullDepEntry (concatStringsSep ";"
(map toPatchCommand patches) (map toPatchCommand patches)
) ["minInit" "doUnpack"]; ) ["minInit" "doUnpack"];
@@ -326,9 +326,9 @@ args: with args; with stringsWithDeps; with lib;
(${envAdderList env} (${envAdderList env}
echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\""; echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\"";
doWrap = cmd: FullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"]; doWrap = cmd: fullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"];
makeManyWrappers = wildcard : wrapperFlags : FullDepEntry ('' makeManyWrappers = wildcard : wrapperFlags : fullDepEntry (''
for i in ${wildcard}; do for i in ${wildcard}; do
wrapProgram "$i" ${wrapperFlags} wrapProgram "$i" ${wrapperFlags}
done done
@@ -345,7 +345,7 @@ args: with args; with stringsWithDeps; with lib;
preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }'';
doPropagate = FullDepEntry (" doPropagate = fullDepEntry ("
ensureDir \$out/nix-support ensureDir \$out/nix-support
echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
") ["minInit" "defEnsureDir"]; ") ["minInit" "defEnsureDir"];
@@ -356,11 +356,11 @@ args: with args; with stringsWithDeps; with lib;
replaceScriptVar = file: name: value: "sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}"; replaceScriptVar = file: name: value: "sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}";
replaceInScript = file: l: concatStringsSep "\n" ((pairMap (replaceScriptVar file) l)); replaceInScript = file: l: concatStringsSep "\n" ((pairMap (replaceScriptVar file) l));
replaceScripts = l: concatStringsSep "\n" (pairMap replaceInScript l); replaceScripts = l: concatStringsSep "\n" (pairMap replaceInScript l);
doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) ["minInit"]; doReplaceScripts = fullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) ["minInit"];
makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n"; makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n";
textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps); textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps);
inherit noDepEntry FullDepEntry PackEntry; inherit noDepEntry fullDepEntry packEntry;
defList = getAttr ["defList"] [] args; defList = getAttr ["defList"] [] args;
getVal = getValue args defList; getVal = getValue args defList;
@@ -393,11 +393,11 @@ args: with args; with stringsWithDeps; with lib;
surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" + surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" +
x.text + "\n" + after ;}; x.text + "\n" + after ;};
createDirs = FullDepEntry (concatStringsSep ";" createDirs = fullDepEntry (concatStringsSep ";"
(map (x: "ensureDir ${x}") (getAttr ["neededDirs"] [] args)) (map (x: "ensureDir ${x}") (getAttr ["neededDirs"] [] args))
) ["minInit" "defEnsureDir"]; ) ["minInit" "defEnsureDir"];
copyExtraDoc = FullDepEntry ('' copyExtraDoc = fullDepEntry (''
name="$(basename $out)" name="$(basename $out)"
name="''${name#*-}" name="''${name#*-}"
ensureDir "$out/share/doc/$name" ensureDir "$out/share/doc/$name"
@@ -425,7 +425,7 @@ args: with args; with stringsWithDeps; with lib;
a() { return 127; } ; a ; a() { return 127; } ; a ;
"; ";
doMakeCheck = FullDepEntry ('' doMakeCheck = fullDepEntry (''
make check make check
'') ["minInit"]; '') ["minInit"];
@@ -453,7 +453,7 @@ args: with args; with stringsWithDeps; with lib;
(innerBuilderDefsPackage bd) (innerBuilderDefsPackage bd)
{}; {};
generateFontsFromSFD = FullDepEntry ('' generateFontsFromSFD = fullDepEntry (''
for i in *.sfd; do for i in *.sfd; do
fontforge -c \ fontforge -c \
'Open($1); 'Open($1);
@@ -471,7 +471,7 @@ args: with args; with stringsWithDeps; with lib;
done done
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
installFonts = FullDepEntry ('' installFonts = fullDepEntry (''
ensureDir $out/share/fonts/truetype/public/${args.name} ensureDir $out/share/fonts/truetype/public/${args.name}
ensureDir $out/share/fonts/opentype/public/${args.name} ensureDir $out/share/fonts/opentype/public/${args.name}
ensureDir $out/share/fonts/type1/public/${args.name} ensureDir $out/share/fonts/type1/public/${args.name}
@@ -485,12 +485,12 @@ args: with args; with stringsWithDeps; with lib;
cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data
'') ["minInit" "defEnsureDir"]; '') ["minInit" "defEnsureDir"];
simplyShare = shareName: FullDepEntry ('' simplyShare = shareName: fullDepEntry (''
ensureDir $out/share ensureDir $out/share
cp -r . $out/share/${shareName} cp -r . $out/share/${shareName}
'') ["doUnpack" "defEnsureDir"]; '') ["doUnpack" "defEnsureDir"];
doPatchShebangs = dir: FullDepEntry ('' doPatchShebangs = dir: fullDepEntry (''
patchShebangFun() { patchShebangFun() {
# Rewrite all script interpreter file names (`#! /path') under the # Rewrite all script interpreter file names (`#! /path') under the
# specified directory tree to paths found in $PATH. E.g., # specified directory tree to paths found in $PATH. E.g.,
@@ -512,7 +512,7 @@ args: with args; with stringsWithDeps; with lib;
patchShebangFun; patchShebangFun;
'') ["minInit"]; '') ["minInit"];
createPythonInstallationTarget = FullDepEntry ('' createPythonInstallationTarget = fullDepEntry (''
ensureDir $(toPythonPath $out) ensureDir $(toPythonPath $out)
export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
'') ["minInit" "addInputs" "defEnsureDir"]; '') ["minInit" "addInputs" "defEnsureDir"];
pkgs/build-support/deb-package/default.nix
+3 -3
View File
@@ -15,14 +15,14 @@ args : with args;
patch = null; patch = null;
meta = {}; meta = {};
doInstall = if args ? Install then doInstall = if args ? Install then
(FullDepEntry (fullDepEntry
args.Install args.Install
(["doMake"] (["doMake"]
++ (lib.getAttr ["extraInstallDeps"] [] args)) ++ (lib.getAttr ["extraInstallDeps"] [] args))
) )
else FullDepEntry "" ["doMakeInstall"]; else fullDepEntry "" ["doMakeInstall"];
debPatch = FullDepEntry ((if args ? patch then '' debPatch = fullDepEntry ((if args ? patch then ''
gunzip < ${args.patch} | patch -Np1 gunzip < ${args.patch} | patch -Np1
'' else "") '' else "")
+'' +''
pkgs/data/fonts/clearlyU/1.9.nix
+1 -1
View File
@@ -7,7 +7,7 @@ args : with args; with builderDefs;
}; };
buildInputs = [mkfontdir mkfontscale]; buildInputs = [mkfontdir mkfontscale];
configureFlags = []; configureFlags = [];
doInstall = FullDepEntry ('' doInstall = fullDepEntry (''
tar xf ${src} tar xf ${src}
ensureDir $out/share/fonts/ ensureDir $out/share/fonts/
cp *.bdf $out/share/fonts cp *.bdf $out/share/fonts
pkgs/data/fonts/fontWrap/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
doInstall = FullDepEntry (" doInstall = fullDepEntry ("
ensureDir \$out/share/fonts/ ensureDir \$out/share/fonts/
cd \$out/share/fonts cd \$out/share/fonts
for i in ${toString paths}; do for i in ${toString paths}; do
pkgs/data/fonts/junicode/0.6.15.nix
+1 -1
View File
@@ -8,7 +8,7 @@ args : with args; with builderDefs;
buildInputs = [unzip]; buildInputs = [unzip];
configureFlags = []; configureFlags = [];
doInstall = FullDepEntry ('' doInstall = fullDepEntry (''
unzip ${src} unzip ${src}
ensureDir $out/share/fonts/junicode-ttf ensureDir $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf cp *.ttf $out/share/fonts/junicode-ttf
pkgs/data/fonts/lmodern/0.92.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry('' doCopy = fullDepEntry(''
ensureDir $out/share/texmf/fonts/enc ensureDir $out/share/texmf/fonts/enc
ensureDir $out/share/texmf/fonts/map ensureDir $out/share/texmf/fonts/map
ensureDir $out/share/texmf/fonts/type1/public/lm ensureDir $out/share/texmf/fonts/type1/public/lm
pkgs/data/fonts/lmodern/1.010.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry('' doCopy = fullDepEntry(''
ensureDir $out/share/texmf/ ensureDir $out/share/texmf/
ensureDir $out/share/fonts/ ensureDir $out/share/fonts/
pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
+1 -1
View File
@@ -8,7 +8,7 @@ args : with args; with builderDefs;
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
doInstall = FullDepEntry ('' doInstall = fullDepEntry (''
ensureDir $out/share/fonts ensureDir $out/share/fonts
cp *.ttf $out/share/fonts cp *.ttf $out/share/fonts
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
pkgs/development/compilers/fpc/lazarus.nix
+2 -2
View File
@@ -19,7 +19,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext' export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext'
ensureDir $out/share ensureDir $out/share
tar xf ${fpc.src} --strip-components=1 -C $out/share tar xf ${fpc.src} --strip-components=1 -C $out/share
@@ -27,7 +27,7 @@ rec {
'') '')
["minInit" "defEnsureDir" "doUnpack"]; ["minInit" "defEnsureDir" "doUnpack"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'"
'') ["doMakeInstall" "minInit" "defEnsureDir"]; '') ["doMakeInstall" "minInit" "defEnsureDir"];
pkgs/development/compilers/llvm/llvm-gcc.nix
+2 -2
View File
@@ -14,7 +14,7 @@ rec {
patches = [ ./no-sys-dirs.patch ]; patches = [ ./no-sys-dirs.patch ];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \ sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \
-e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \ -e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \
@@ -53,7 +53,7 @@ rec {
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];
configureCommand = "$(ls ../llvm-gcc*.*.source/configure)"; configureCommand = "$(ls ../llvm-gcc*.*.source/configure)";
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
mv $out/bin/gcc $out/bin/llvm-gcc mv $out/bin/gcc $out/bin/llvm-gcc
mv $out/bin/g++ $out/bin/llvm-g++ mv $out/bin/g++ $out/bin/llvm-g++
'')["doMakeInstall" "minInit"]; '')["doMakeInstall" "minInit"];
pkgs/development/compilers/qi/9.1.nix
+1 -1
View File
@@ -13,7 +13,7 @@ let
shell=stdenv.shell; shell=stdenv.shell;
in in
let let
allBuild = FullDepEntry (" allBuild = fullDepEntry ("
(sleep 0.1; echo ) | clisp install.txt; (sleep 0.1; echo ) | clisp install.txt;
(sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp (sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp
ensureDir \$out/share ensureDir \$out/share
pkgs/development/interpreters/io/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
doPatchShebangs = args.doPatchShebangs; doPatchShebangs = args.doPatchShebangs;
version = lib.getAttr ["version"] "2008.03.30" args; version = lib.getAttr ["version"] "2008.03.30" args;
@@ -29,7 +29,7 @@ rec {
phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples") phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples")
(doPatchShebangs "$out/lib/io")]; (doPatchShebangs "$out/lib/io")];
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
for i in $pkgs ${ for i in $pkgs ${
if args.stdenv ? glibc then args.stdenv.glibc else "" if args.stdenv ? glibc then args.stdenv.glibc else ""
} ${ } ${
@@ -41,7 +41,7 @@ rec {
done done
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/share/io ensureDir $out/share/io
ln -s $out/lib/io/addons $out/share/io ln -s $out/lib/io/addons $out/share/io
pkgs/development/interpreters/plt-scheme/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
pkgs/development/interpreters/ruby/gems.nix
+1 -1
View File
@@ -9,7 +9,7 @@ rec {
buildInputs = [ruby makeWrapper]; buildInputs = [ruby makeWrapper];
configureFlags = []; configureFlags = [];
doInstall = FullDepEntry ('' doInstall = fullDepEntry (''
ruby setup.rb --prefix=$out/ ruby setup.rb --prefix=$out/
wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
pkgs/development/libraries/chipmunk/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "4.1.0" args; version = lib.getAttr ["version"] "4.1.0" args;
buildInputs = with args; [ buildInputs = with args; [
@@ -22,11 +22,11 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"]; phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
genMakefile = FullDepEntry '' genMakefile = fullDepEntry ''
cmake -D CMAKE_INSTALL_PREFIX=$out . cmake -D CMAKE_INSTALL_PREFIX=$out .
'' ["minInit" "addInputs" "doUnpack"]; '' ["minInit" "addInputs" "doUnpack"];
demoInstall = FullDepEntry('' demoInstall = fullDepEntry(''
ensureDir $out/bin ensureDir $out/bin
cp chipmunk_demos $out/bin cp chipmunk_demos $out/bin
'') ["doMakeInstall" "defEnsureDir"]; '') ["doMakeInstall" "defEnsureDir"];
pkgs/development/libraries/libcv/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "" args; version = lib.getAttr ["version"] "" args;
buildInputs = with args; [ buildInputs = with args; [
@@ -22,7 +22,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall" "postInstall"]; phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/include/opencv/* $out/include ln -s $out/include/opencv/* $out/include
'') ["doMakeInstall" "minInit"]; '') ["doMakeInstall" "minInit"];
pkgs/development/libraries/webkit/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
doReplaceUsrBin = FullDepEntry ('' doReplaceUsrBin = fullDepEntry (''
for i in $(find . -name '*.pl') $(find . -name '*.pm'); do for i in $(find . -name '*.pl') $(find . -name '*.pm'); do
sed -e 's@/usr/bin/gcc@gcc@' -i $i sed -e 's@/usr/bin/gcc@gcc@' -i $i
done done
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
doAddPrograms = FullDepEntry ('' doAddPrograms = fullDepEntry (''
for i in Programs/.libs/*; do for i in Programs/.libs/*; do
cp $i $out/bin/webkit-program-$(basename $i) cp $i $out/bin/webkit-program-$(basename $i)
done done
pkgs/development/python-modules/libsexy/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "postInstall"]; phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
postInstall = a.FullDepEntry ('' postInstall = a.fullDepEntry (''
ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/ ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
'') ["minInit"]; '') ["minInit"];
pkgs/development/python-modules/xmpppy/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["mkDirs" "installPythonPackage"]; phaseNames = ["mkDirs" "installPythonPackage"];
mkDirs = a.FullDepEntry('' mkDirs = a.fullDepEntry(''
ensureDir $out/bin $out/lib $out/share $(toPythonPath $out) ensureDir $out/bin $out/lib $out/share $(toPythonPath $out)
export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
'') ["defEnsureDir" "addInputs"]; '') ["defEnsureDir" "addInputs"];
pkgs/development/tools/misc/ltrace/0.5-3deb.nix
+2 -2
View File
@@ -13,14 +13,14 @@ args : with args; let
goSrcDir = " goSrcDir = "
cd ltrace-*; cd ltrace-*;
"; ";
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
gunzip < ${patch} | patch -Np1 gunzip < ${patch} | patch -Np1
sed -e s@-Werror@@ -i Makefile.in sed -e s@-Werror@@ -i Makefile.in
'')["minInit" "doUnpack"]; '')["minInit" "doUnpack"];
}; };
in with localDefs; in with localDefs;
let let
preConfigure = FullDepEntry (" preConfigure = fullDepEntry ("
sed -e 's@-o root -g root@@' -i Makefile.in; sed -e 's@-o root -g root@@' -i Makefile.in;
") [doUnpack minInit]; ") [doUnpack minInit];
in in
pkgs/development/tools/misc/xxdiff/3.2.nix
+3 -3
View File
@@ -18,17 +18,17 @@ rec {
''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'') ''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'')
]; ];
prepareMainBuild = FullDepEntry ('' prepareMainBuild = fullDepEntry (''
cd src cd src
export QTDIR=${qt}/ export QTDIR=${qt}/
make -f Makefile.bootstrap makefile make -f Makefile.bootstrap makefile
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
fixInc = FullDepEntry('' fixInc = fullDepEntry(''
sed -e '1i\#include <stdlib.h>' -i resources.inline.h sed -e '1i\#include <stdlib.h>' -i resources.inline.h
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
deploy = FullDepEntry ('' deploy = fullDepEntry (''
ensureDir $out/bin/ ensureDir $out/bin/
cp ../bin/xxdiff $out/bin cp ../bin/xxdiff $out/bin
cd .. cd ..
pkgs/games/construo/0.2.2.nix
+1 -1
View File
@@ -10,7 +10,7 @@ args : with args;
++ (if args ? mesa then [args.mesa args.freeglut] else []) ++ (if args ? mesa then [args.mesa args.freeglut] else [])
; ;
configureFlags = [""]; configureFlags = [""];
preConfigure = builderDefs.stringsWithDeps.FullDepEntry ('' preConfigure = builderDefs.stringsWithDeps.fullDepEntry (''
sed -e 's/math[.]h/cmath/' -i vector.cxx sed -e 's/math[.]h/cmath/' -i vector.cxx
sed -e 's/games/bin/' -i Makefile.in sed -e 's/games/bin/' -i Makefile.in
sed -e '1i\#include <stdlib.h>' -i construo_main.cxx -i command_line.cxx -i config.hxx sed -e '1i\#include <stdlib.h>' -i construo_main.cxx -i command_line.cxx -i config.hxx
pkgs/games/fsg/alt-builder.nix
+2 -2
View File
@@ -9,13 +9,13 @@ args: with args;
}; };
in with localDefs; in with localDefs;
let let
preBuild = FullDepEntry " preBuild = fullDepEntry "
sed -e ' sed -e '
s@currentProbIndex != 100@0@; s@currentProbIndex != 100@0@;
' -i MainFrame.cpp; ' -i MainFrame.cpp;
" [minInit]; " [minInit];
installPhase = FullDepEntry " installPhase = fullDepEntry "
ensureDir \$out/bin \$out/libexec; ensureDir \$out/bin \$out/libexec;
cp sand \$out/libexec; cp sand \$out/libexec;
echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg; echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;
pkgs/games/gnuchess/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]; phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.FullDepEntry ('' preBuild = a.fullDepEntry (''
sed -i src/input.c -e 's/static pthread_t/pthread_t/' sed -i src/input.c -e 's/static pthread_t/pthread_t/'
sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
pkgs/games/nethack/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
preBuild = a.FullDepEntry ('' preBuild = a.fullDepEntry (''
( cd sys/unix ; sh setup.sh ) ( cd sys/unix ; sh setup.sh )
sed -e 's@.*define HACKDIR.*@\#define HACKDIR "/tmp/nethack"@' -i include/config.h sed -e 's@.*define HACKDIR.*@\#define HACKDIR "/tmp/nethack"@' -i include/config.h
sed -e '/define COMPRESS/d' -i include/config.h sed -e '/define COMPRESS/d' -i include/config.h
@@ -35,7 +35,7 @@ rec {
sed -re 's@^(CH...).*@\1 = true@' -i Makefile sed -re 's@^(CH...).*@\1 = true@' -i Makefile
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
postInstall = a.FullDepEntry ('' postInstall = a.fullDepEntry (''
ensureDir $out/bin ensureDir $out/bin
ln -s $out/games/nethack $out/bin/nethack ln -s $out/games/nethack $out/bin/nethack
sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"' sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"'
pkgs/games/orbit/1.01.nix
+1 -1
View File
@@ -13,7 +13,7 @@ args : with args; with builderDefs;
url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01-9.diff.gz; url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01-9.diff.gz;
sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2"; sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2";
}; };
customBuild = FullDepEntry ('' customBuild = fullDepEntry (''
gunzip < ${debianPatch} | patch -Np1 gunzip < ${debianPatch} | patch -Np1
cd src cd src
sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c
pkgs/games/tuxracer/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = a.FullDepEntry ('' preConfigure = a.fullDepEntry (''
sed -e '/TCL_LIB_LIST=/atcl8.4' -i configure sed -e '/TCL_LIB_LIST=/atcl8.4' -i configure
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DGLX_GLXEXT_LEGACY=1" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DGLX_GLXEXT_LEGACY=1"
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
pkgs/games/xboard/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]; phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.FullDepEntry('' preBuild = a.fullDepEntry(''
sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];
pkgs/games/xsokoban/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"]; phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"];
preConfigure = a.FullDepEntry ('' preConfigure = a.fullDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11"
for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
chmod a+rw config.h chmod a+rw config.h
@@ -35,7 +35,7 @@ rec {
sed -e '/if [(]owner[)]/iowner=1;' -i main.c sed -e '/if [(]owner[)]/iowner=1;' -i main.c
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
preBuild = a.FullDepEntry ('' preBuild = a.fullDepEntry (''
sed -e "s@/usr/local/@$out/@" -i Makefile sed -e "s@/usr/local/@$out/@" -i Makefile
sed -e "s@ /bin/@ @" -i Makefile sed -e "s@ /bin/@ @" -i Makefile
ensureDir $out/bin $out/share $out/man/man1 $out/lib ensureDir $out/bin $out/share $out/man/man1 $out/lib
pkgs/games/zangband/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@ rec {
inherit buildInputs; inherit buildInputs;
configureFlags = []; configureFlags = [];
preConfigure = a.FullDepEntry ('' preConfigure = a.fullDepEntry (''
chmod a+rwX -R . chmod a+rwX -R .
sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
sed -e '/FIXED_PATHS/d' -i src/z-config.h sed -e '/FIXED_PATHS/d' -i src/z-config.h
@@ -26,7 +26,7 @@ rec {
ensureDir $out/bin ensureDir $out/bin
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
postInstall = a.FullDepEntry ('' postInstall = a.fullDepEntry (''
mv $out/bin/zangband $out/bin/.zangband.real mv $out/bin/zangband $out/bin/.zangband.real
echo '#! /bin/sh echo '#! /bin/sh
PATH="$PATH:${a.coreutils}/bin" PATH="$PATH:${a.coreutils}/bin"
pkgs/lib/strings-with-deps.nix
+1 -1
View File
@@ -6,7 +6,7 @@ Usage:
builder = writeScript "fsg-4.4-builder" builder = writeScript "fsg-4.4-builder"
(textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]); (textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]);
a step is defined by noDepEntry, FullDepEntry or PackEntry. a step is defined by noDepEntry, fullDepEntry or packEntry.
To ensure that prerequisite are met those are added before the task itself by To ensure that prerequisite are met those are added before the task itself by
textClosureDupList. Duplicated items are removed again. textClosureDupList. Duplicated items are removed again.
pkgs/misc/tex/texlive/aggregate.nix
+1 -1
View File
@@ -5,7 +5,7 @@ rec {
buildInputs = lib.closePropagation paths; buildInputs = lib.closePropagation paths;
doAggregate = FullDepEntry ('' doAggregate = fullDepEntry (''
for currentPath in ${lib.concatStringsSep " " buildInputs}; do for currentPath in ${lib.concatStringsSep " " buildInputs}; do
echo Symlinking "$currentPath" echo Symlinking "$currentPath"
pkgs/misc/tex/texlive/beamer.nix
+1 -1
View File
@@ -9,7 +9,7 @@ rec {
buildInputs = [texLive]; buildInputs = [texLive];
propagatedBuildInputs = [texLiveLatexXColor texLivePGF]; propagatedBuildInputs = [texLiveLatexXColor texLivePGF];
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry ('' doCopy = fullDepEntry (''
ensureDir $out/share/texmf-dist/tex/latex/beamer ensureDir $out/share/texmf-dist/tex/latex/beamer
cp -r * $out/share/texmf-dist/tex/latex/beamer cp -r * $out/share/texmf-dist/tex/latex/beamer
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
pkgs/misc/tex/texlive/cm-super.nix
+1 -1
View File
@@ -7,7 +7,7 @@ rec {
}; };
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry ('' doCopy = fullDepEntry (''
ensureDir $out/share/texmf/fonts/enc ensureDir $out/share/texmf/fonts/enc
ensureDir $out/share/texmf/fonts/map ensureDir $out/share/texmf/fonts/map
ensureDir $out/share/texmf/fonts/type1/public/cm-super ensureDir $out/share/texmf/fonts/type1/public/cm-super
pkgs/misc/tex/texlive/context.nix
+1 -1
View File
@@ -8,7 +8,7 @@ rec {
buildInputs = [texLive]; buildInputs = [texLive];
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry ('' doCopy = fullDepEntry (''
ensureDir $out/share/texmf ensureDir $out/share/texmf
cp -r * $out/share/texmf cp -r * $out/share/texmf
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
pkgs/misc/tex/texlive/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@ rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
doPreConfigure = FullDepEntry ('' doPreConfigure = fullDepEntry (''
ensureDir $out ensureDir $out
ensureDir $out/nix-support ensureDir $out/nix-support
cp ${setupHook} $out/nix-support/setup-hook.sh cp ${setupHook} $out/nix-support/setup-hook.sh
@@ -35,7 +35,7 @@ rec {
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
doPostInstall = FullDepEntry('' doPostInstall = fullDepEntry(''
mv $out/bin $out/libexec mv $out/bin $out/libexec
ensureDir $out/bin ensureDir $out/bin
for i in $out/libexec/*/*; do for i in $out/libexec/*/*; do
pkgs/misc/tex/texlive/extra.nix
+1 -1
View File
@@ -8,7 +8,7 @@ rec {
buildInputs = [texLive]; buildInputs = [texLive];
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry ('' doCopy = fullDepEntry (''
ensureDir $out/share ensureDir $out/share
cp -r texmf* $out/share/ cp -r texmf* $out/share/
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
pkgs/misc/tex/texlive/pgf.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rec {
propagatedBuildInputs = [texLiveLatexXColor texLive]; propagatedBuildInputs = [texLiveLatexXColor texLive];
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry ('' doCopy = fullDepEntry (''
ensureDir $out/share/texmf/tex/generic/pgf ensureDir $out/share/texmf/tex/generic/pgf
cp -r * $out/share/texmf/tex/generic/pgf cp -r * $out/share/texmf/tex/generic/pgf
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
pkgs/misc/tex/texlive/xcolor.nix
+1 -1
View File
@@ -8,7 +8,7 @@ rec {
buildInputs = [texLive]; buildInputs = [texLive];
phaseNames = ["doCopy"]; phaseNames = ["doCopy"];
doCopy = FullDepEntry ('' doCopy = fullDepEntry (''
export HOME=$PWD export HOME=$PWD
ensureDir $out/share/texmf/tex/latex/xcolor ensureDir $out/share/texmf/tex/latex/xcolor
pkgs/os-specific/linux/atheros/0.9.3.3.nix
+2 -2
View File
@@ -18,11 +18,11 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
doPatch = FullDepEntry (if patchAR2425x86 !="" then '' doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
cd hal cd hal
patch -Np1 -i ${patchAR2425x86} patch -Np1 -i ${patchAR2425x86}
'' else "") [minInit doUnpack]; '' else "") [minInit doUnpack];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/0.9.4.nix
+1 -1
View File
@@ -12,7 +12,7 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/r2756.nix
+2 -2
View File
@@ -18,12 +18,12 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
doPatch = FullDepEntry (if patchAR2425x86 !="" then '' doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
cd hal cd hal
patch -Np1 -i ${patchAR2425x86} patch -Np1 -i ${patchAR2425x86}
cd .. cd ..
'' else "") [minInit doUnpack]; '' else "") [minInit doUnpack];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/r3122.nix
+1 -1
View File
@@ -12,7 +12,7 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/r3574.nix
+1 -1
View File
@@ -12,7 +12,7 @@ args : with args;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let let
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/r3693.nix
+2 -2
View File
@@ -15,13 +15,13 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
echo Replacing HAL. echo Replacing HAL.
tar xvf ${hal20080528} tar xvf ${hal20080528}
rm -r hal rm -r hal
mv ath_hal-* hal mv ath_hal-* hal
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/r3837.nix
+2 -2
View File
@@ -16,13 +16,13 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
echo Replacing HAL. echo Replacing HAL.
tar xvf ${hal20080528} tar xvf ${hal20080528}
rm -r hal rm -r hal
mv ath_hal-* hal mv ath_hal-* hal
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/atheros/r3867.nix
+2 -2
View File
@@ -16,13 +16,13 @@ args : with args;
}; };
in with localDefs; in with localDefs;
let let
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
echo Replacing HAL. echo Replacing HAL.
tar xvf ${hal20080528} tar xvf ${hal20080528}
rm -r hal rm -r hal
mv ath_hal-* hal mv ath_hal-* hal
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
postInstall = FullDepEntry ('' postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall]; '') [minInit doMakeInstall];
in in
pkgs/os-specific/linux/blcr/0.6.5.nix
+1 -1
View File
@@ -13,7 +13,7 @@ rec {
"--with-system-map=${args.kernel}/System.map" "--with-system-map=${args.kernel}/System.map"
]; ];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's/FASTCALL//' -i configure configure.ac sed -e 's/FASTCALL//' -i configure configure.ac
sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac
'')["doUnpack" "minInit"]; '')["doUnpack" "minInit"];
pkgs/os-specific/linux/fbterm/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ rec {
inherit buildInputs; inherit buildInputs;
configureFlags = []; configureFlags = [];
fixInc = a.FullDepEntry ('' fixInc = a.fullDepEntry (''
sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];
pkgs/os-specific/linux/gw6c/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ rec {
goSrcDir = "cd tspc-advanced"; goSrcDir = "cd tspc-advanced";
preBuild = FullDepEntry ('' preBuild = fullDepEntry (''
sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c; sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@' -i template/linux.sh sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@' -i template/linux.sh
sed -e 's@/sbin/route@${nettools}/sbin/route@' -i template/linux.sh sed -e 's@/sbin/route@${nettools}/sbin/route@' -i template/linux.sh
pkgs/os-specific/linux/jfsrec/svn-7.nix
+2 -2
View File
@@ -8,11 +8,11 @@ rec {
buildInputs = [boost]; buildInputs = [boost];
configureFlags = []; configureFlags = [];
doFixBoost = FullDepEntry ('' doFixBoost = fullDepEntry (''
sed -e 's/-lboost_[a-z_]*/&-mt/g' -i src/Makefile.in sed -e 's/-lboost_[a-z_]*/&-mt/g' -i src/Makefile.in
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
doFixInc = FullDepEntry ('' doFixInc = fullDepEntry (''
sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
cat src/unicode_to_utf8.cpp cat src/unicode_to_utf8.cpp
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+2 -2
View File
@@ -8,10 +8,10 @@ rec {
buildInputs = []; buildInputs = [];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
debugStep = FullDepEntry ('' debugStep = fullDepEntry (''
cat config-host.mak cat config-host.mak
'') ["minInit"]; '') ["minInit"];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh sed -e '/depmod/d' -i install.sh
pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
+2 -2
View File
@@ -8,10 +8,10 @@ rec {
buildInputs = []; buildInputs = [];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
debugStep = FullDepEntry ('' debugStep = fullDepEntry (''
cat config-host.mak cat config-host.mak
'') ["minInit"]; '') ["minInit"];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh sed -e '/depmod/d' -i install.sh
pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
+1 -1
View File
@@ -8,7 +8,7 @@ rec {
buildInputs = [libtool gettext e2fsprogs]; buildInputs = [libtool gettext e2fsprogs];
configureFlags = []; configureFlags = [];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sp_path=$(echo $PATH | sed -e 's/:/ /g'); sp_path=$(echo $PATH | sed -e 's/:/ /g');
sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure
sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure
pkgs/servers/dict/dictd-db.nix
+1 -1
View File
@@ -4,7 +4,7 @@ let makeDictdDB = _src: _name: _subdir: _locale:
with builderDefs; with builderDefs;
let localDefs = builderDefs.passthru.function (rec { let localDefs = builderDefs.passthru.function (rec {
src=_src; src=_src;
doInstall = FullDepEntry ('' doInstall = fullDepEntry (''
ensureDir $out/share/dictd ensureDir $out/share/dictd
tar xf ${src} tar xf ${src}
cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd
pkgs/servers/gpm/1.20.6.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
'') ["addInputs" "doUnpack" "minInit"]; '') ["addInputs" "doUnpack" "minInit"];
pkgs/servers/gpm/1.99.6.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
sed -e 's/gpm2//' -i Makefile.in sed -e 's/gpm2//' -i Makefile.in
'') ["addInputs" "doUnpack" "minInit"]; '') ["addInputs" "doUnpack" "minInit"];
pkgs/servers/http/nginx/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "0.7.47" args; version = lib.getAttr ["version"] "0.7.47" args;
buildInputs = with args; [ buildInputs = with args; [
@@ -25,7 +25,7 @@ rec {
"--with-http_secure_link_module" "--with-http_secure_link_module"
]; ];
preConfigure = FullDepEntry '' preConfigure = fullDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.libxml2}/include/libxml2" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.libxml2}/include/libxml2"
'' []; '' [];
pkgs/servers/xmpp/openfire/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ args : with args; with builderDefs;
buildInputs = [jre]; buildInputs = [jre];
configureFlags = []; configureFlags = [];
installPhase = FullDepEntry ('' installPhase = fullDepEntry (''
sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire
cp -r . $out cp -r . $out
rm -r $out/logs rm -r $out/logs
pkgs/servers/xmpp/pyIRCt/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
deploy = a.FullDepEntry ('' deploy = a.fullDepEntry (''
ensureDir $out/bin $out/share/${name} ensureDir $out/bin $out/share/${name}
sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
pkgs/servers/xmpp/pyMAILt/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)]; phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)];
deploy = a.FullDepEntry ('' deploy = a.fullDepEntry (''
cd mail-transport cd mail-transport
ensureDir $out/bin $out/share/${name} ensureDir $out/bin $out/share/${name}
sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py
pkgs/tools/X11/x2vnc/1.7.2.nix
+1 -1
View File
@@ -8,7 +8,7 @@ args : with args; with builderDefs.passthru.function {src="";};
}; };
buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto]; buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto];
doCreatePrefix = FullDepEntry ('' doCreatePrefix = fullDepEntry (''
ensureDir $out ensureDir $out
'') ["defEnsureDir"]; '') ["defEnsureDir"];
configureFlags = []; configureFlags = [];
pkgs/tools/graphics/cuneiform/default.nix
+2 -2
View File
@@ -21,14 +21,14 @@ rec {
libc = if a.stdenv ? glibc then a.stdenv.glibc else ""; libc = if a.stdenv ? glibc then a.stdenv.glibc else "";
doCmake = a.FullDepEntry('' doCmake = a.fullDepEntry(''
ensureDir $PWD/builddir ensureDir $PWD/builddir
cd builddir cd builddir
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
postInstall = a.FullDepEntry('' postInstall = a.fullDepEntry(''
patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""} $out/bin/cuneiform patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""} $out/bin/cuneiform
'') ["minInit" "addInputs" "doMakeInstall"]; '') ["minInit" "addInputs" "doMakeInstall"];
pkgs/tools/graphics/qrdecode/default.nix
+4 -4
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "0.9.3" args; version = lib.getAttr ["version"] "0.9.3" args;
buildInputs = with args; [ buildInputs = with args; [
@@ -22,15 +22,15 @@ rec {
phaseNames = ["preConfigure" "doConfigure" "doMake" phaseNames = ["preConfigure" "doConfigure" "doMake"
"createDirs" "doMakeInstall" "postInstall"]; "createDirs" "doMakeInstall" "postInstall"];
preConfigure = FullDepEntry '' preConfigure = fullDepEntry ''
cd src cd src
sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in
'' ["doUnpack"]; '' ["doUnpack"];
postInstall = FullDepEntry '' postInstall = fullDepEntry ''
cp sample/simple/simpletest $out/bin/qrdecode cp sample/simple/simpletest $out/bin/qrdecode
cd .. cd ..
'' ["doMake"]; '' ["doMake"];
createDirs = FullDepEntry '' createDirs = fullDepEntry ''
ensureDir $out/bin $out/lib $out/include $out/share ensureDir $out/bin $out/lib $out/include $out/share
'' ["defEnsureDir"]; '' ["defEnsureDir"];
pkgs/tools/misc/mdbtools/0.6-pre1.nix
+1 -1
View File
@@ -8,7 +8,7 @@ rec {
buildInputs = [glib readline bison flex pkgconfig]; buildInputs = [glib readline bison flex pkgconfig];
configureFlags = []; configureFlags = [];
preConfigure = FullDepEntry ('' preConfigure = fullDepEntry (''
sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];
pkgs/tools/misc/relfs/cvs.2007.12.01.nix
+1 -1
View File
@@ -13,7 +13,7 @@ args : with args;
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let build = FullDepEntry (" let build = fullDepEntry ("
cd deps cd deps
sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
make make
pkgs/tools/networking/ppp/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ rec {
/* We want to run it as far as we can with our current permissions /* We want to run it as far as we can with our current permissions
For example, dependent builds would prefer to run --version For example, dependent builds would prefer to run --version
without ever using setuid pppd. We are not setuid anyway, so.. */ without ever using setuid pppd. We are not setuid anyway, so.. */
patchPrivileged = a.FullDepEntry('' patchPrivileged = a.fullDepEntry(''
sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c
sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8 sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
pkgs/tools/networking/rp-pppoe/default.nix
+2 -2
View File
@@ -26,12 +26,12 @@ rec {
export PPPD=${a.ppp}/sbin/pppd export PPPD=${a.ppp}/sbin/pppd
''); '');
patchInstall = a.FullDepEntry('' patchInstall = a.fullDepEntry(''
sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@' sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@'
sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@' sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
makeDirs = a.FullDepEntry('' makeDirs = a.fullDepEntry(''
ensureDir $out/share/${name}/etc/ppp ensureDir $out/share/${name}/etc/ppp
'') ["minInit" "defEnsureDir"]; '') ["minInit" "defEnsureDir"];
pkgs/tools/networking/smbfs-fuse/0.8.7.nix
+1 -1
View File
@@ -8,7 +8,7 @@ args : with args; with builderDefs;
buildInputs = [samba fuse]; buildInputs = [samba fuse];
configureFlags = []; configureFlags = [];
postInstall = FullDepEntry postInstall = fullDepEntry
('' (''
ensureDir $out/lib ensureDir $out/lib
ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0 ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
pkgs/tools/security/bmrsa/11.nix
+2 -2
View File
@@ -2,7 +2,7 @@ args :
let let
lib = args.lib; lib = args.lib;
fetchurl = args.fetchurl; fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry; fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "" args; version = lib.getAttr ["version"] "" args;
buildInputs = with args; [ buildInputs = with args; [
@@ -21,7 +21,7 @@ rec {
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doMakeInstall"]; phaseNames = ["doMakeInstall"];
doUnpack = FullDepEntry ('' doUnpack = fullDepEntry (''
mkdir bmrsa mkdir bmrsa
cd bmrsa cd bmrsa
unzip ${src} unzip ${src}

Some files were not shown because too many files have changed in this diff Show More