FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
This commit is contained in:
@@ -25,7 +25,7 @@ rec {
|
||||
/* We want to run it as far as we can with our current permissions
|
||||
For example, dependent builds would prefer to run --version
|
||||
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 '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8
|
||||
'') ["minInit" "doUnpack"];
|
||||
|
||||
@@ -26,12 +26,12 @@ rec {
|
||||
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@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
|
||||
'') ["minInit" "doUnpack"];
|
||||
|
||||
makeDirs = a.FullDepEntry(''
|
||||
makeDirs = a.fullDepEntry(''
|
||||
ensureDir $out/share/${name}/etc/ppp
|
||||
'') ["minInit" "defEnsureDir"];
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ args : with args; with builderDefs;
|
||||
|
||||
buildInputs = [samba fuse];
|
||||
configureFlags = [];
|
||||
postInstall = FullDepEntry
|
||||
postInstall = fullDepEntry
|
||||
(''
|
||||
ensureDir $out/lib
|
||||
ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
|
||||
|
||||
Reference in New Issue
Block a user