FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
This commit is contained in:
@@ -2,7 +2,7 @@ args :
|
||||
let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
FullDepEntry = args.FullDepEntry;
|
||||
fullDepEntry = args.fullDepEntry;
|
||||
|
||||
version = lib.getAttr ["version"] "4.1.0" args;
|
||||
buildInputs = with args; [
|
||||
@@ -22,11 +22,11 @@ rec {
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
|
||||
|
||||
genMakefile = FullDepEntry ''
|
||||
genMakefile = fullDepEntry ''
|
||||
cmake -D CMAKE_INSTALL_PREFIX=$out .
|
||||
'' ["minInit" "addInputs" "doUnpack"];
|
||||
|
||||
demoInstall = FullDepEntry(''
|
||||
demoInstall = fullDepEntry(''
|
||||
ensureDir $out/bin
|
||||
cp chipmunk_demos $out/bin
|
||||
'') ["doMakeInstall" "defEnsureDir"];
|
||||
|
||||
@@ -2,7 +2,7 @@ args :
|
||||
let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
FullDepEntry = args.FullDepEntry;
|
||||
fullDepEntry = args.fullDepEntry;
|
||||
|
||||
version = lib.getAttr ["version"] "" args;
|
||||
buildInputs = with args; [
|
||||
@@ -22,7 +22,7 @@ rec {
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
|
||||
|
||||
postInstall = FullDepEntry (''
|
||||
postInstall = fullDepEntry (''
|
||||
ln -s $out/include/opencv/* $out/include
|
||||
'') ["doMakeInstall" "minInit"];
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@ rec {
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
|
||||
|
||||
doReplaceUsrBin = FullDepEntry (''
|
||||
doReplaceUsrBin = fullDepEntry (''
|
||||
for i in $(find . -name '*.pl') $(find . -name '*.pm'); do
|
||||
sed -e 's@/usr/bin/gcc@gcc@' -i $i
|
||||
done
|
||||
'') ["minInit" "doUnpack"];
|
||||
|
||||
doAddPrograms = FullDepEntry (''
|
||||
doAddPrograms = fullDepEntry (''
|
||||
for i in Programs/.libs/*; do
|
||||
cp $i $out/bin/webkit-program-$(basename $i)
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user