FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
This commit is contained in:
@@ -11,11 +11,11 @@ args : with args;
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
in with localDefs;
|
||||
let
|
||||
fixPkgconfig = FullDepEntry ("
|
||||
fixPkgconfig = fullDepEntry ("
|
||||
ensureDir \$out/lib
|
||||
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
fixInterpreter = FullDepEntry ("
|
||||
fixInterpreter = fullDepEntry ("
|
||||
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
|
||||
") [minInit doMakeInstall];
|
||||
in
|
||||
|
||||
@@ -11,11 +11,11 @@ args : with args;
|
||||
} ;
|
||||
in with localDefs;
|
||||
let
|
||||
fixPkgconfig = FullDepEntry ("
|
||||
fixPkgconfig = fullDepEntry ("
|
||||
ensureDir \$out/lib
|
||||
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
fixInterpreter = FullDepEntry ("
|
||||
fixInterpreter = fullDepEntry ("
|
||||
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
|
||||
") [minInit doMakeInstall];
|
||||
in
|
||||
|
||||
@@ -11,11 +11,11 @@ args : with args;
|
||||
} ;
|
||||
in with localDefs;
|
||||
let
|
||||
fixPkgconfig = FullDepEntry ("
|
||||
fixPkgconfig = fullDepEntry ("
|
||||
ensureDir \$out/lib
|
||||
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
fixInterpreter = FullDepEntry ("
|
||||
fixInterpreter = fullDepEntry ("
|
||||
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
|
||||
") [minInit doMakeInstall];
|
||||
in
|
||||
|
||||
@@ -22,7 +22,7 @@ args : with args;
|
||||
};
|
||||
in with localDefs;
|
||||
let
|
||||
install = FullDepEntry ("
|
||||
install = fullDepEntry ("
|
||||
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 '/^\s*$/aPATH=\$PATH:${xvinfo}/bin:${xdpyinfo}/bin' -i compiz-manager
|
||||
|
||||
@@ -11,11 +11,11 @@ args : with args;
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
in with localDefs;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
sharePlugins = fullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [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/scalefilter/scalefilter.c;
|
||||
") [minInit doUnpack];
|
||||
|
||||
@@ -11,11 +11,11 @@ args : with args;
|
||||
} ;
|
||||
in with localDefs;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
sharePlugins = fullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [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/scalefilter/scalefilter.c;
|
||||
sed -e 's@#include <compiz-mousepoll.h>@#include <compiz/compiz-mousepoll.h>@' -i src/showmouse/showmouse.c;
|
||||
|
||||
@@ -11,11 +11,11 @@ args : with args;
|
||||
} ;
|
||||
in with localDefs;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
sharePlugins = fullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
fixIncludes = FullDepEntry (''
|
||||
fixIncludes = fullDepEntry (''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz"
|
||||
'') [minInit doUnpack];
|
||||
in
|
||||
|
||||
@@ -11,7 +11,7 @@ args : with args;
|
||||
} null; /* null is a terminator for sumArgs */
|
||||
in with localDefs;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
sharePlugins = fullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
|
||||
@@ -11,7 +11,7 @@ args : with args;
|
||||
} ;
|
||||
in with localDefs;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
sharePlugins = fullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
|
||||
@@ -11,7 +11,7 @@ args : with args;
|
||||
} ;
|
||||
in with localDefs;
|
||||
let
|
||||
sharePlugins = FullDepEntry ("
|
||||
sharePlugins = fullDepEntry ("
|
||||
ensureDir \$out/share/compiz-plugins
|
||||
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
|
||||
") [minInit doMakeInstall defEnsureDir];
|
||||
|
||||
@@ -24,7 +24,7 @@ args : with args;
|
||||
};
|
||||
in with localDefs;
|
||||
let
|
||||
postAll = FullDepEntry ("
|
||||
postAll = fullDepEntry ("
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
|
||||
@@ -25,7 +25,7 @@ args : with args;
|
||||
};
|
||||
in with localDefs;
|
||||
let
|
||||
postAll = FullDepEntry ("
|
||||
postAll = fullDepEntry ("
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
|
||||
@@ -24,7 +24,7 @@ args : with args;
|
||||
};
|
||||
in with localDefs;
|
||||
let
|
||||
postAll = FullDepEntry ("
|
||||
postAll = fullDepEntry ("
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
|
||||
done
|
||||
|
||||
@@ -3,7 +3,7 @@ let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
noDepEntry = args.noDepEntry;
|
||||
FullDepEntry = args.FullDepEntry;
|
||||
fullDepEntry = args.fullDepEntry;
|
||||
|
||||
buildInputs = lib.attrVals ["clisp" "texinfo"] args;
|
||||
version = lib.getAttr ["version"] "0.9.4.1" args;
|
||||
@@ -22,7 +22,7 @@ rec {
|
||||
export HOME="$NIX_BUILD_TOP";
|
||||
'');
|
||||
|
||||
installation = FullDepEntry (''
|
||||
installation = fullDepEntry (''
|
||||
ensureDir $out/bin
|
||||
ensureDir $out/share/stumpwm/doc
|
||||
ensureDir $out/share/info
|
||||
|
||||
Reference in New Issue
Block a user