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

I found a package that carries LICENCE file - adding to forceCopy list; also added some service functionality (needed by the same package).

Browse Source 
svn path=/nixpkgs/trunk/; revision=13630
This commit is contained in:
Michael Raskin 2008-12-14 14:54:47 +00:00
parent abf1aeca3b
commit 560d0d1597
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/top-level/builder-defs.nix
View File

@ -9,7 +9,7 @@ args: with args; with stringsWithDeps; with lib;
forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"]; forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"];
forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL" forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
"README" "AUTHORS" "ChangeLog" "CHANGES"] ++ "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
(optional (getAttr ["forceCopyDoc"] true args) "doc"); (optional (getAttr ["forceCopyDoc"] true args) "doc");
archiveType = s: archiveType = s:
@ -278,8 +278,8 @@ args: with args; with stringsWithDeps; with lib;
") ["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"
for f in ${toString forceCopy}; do for f in ${toString forceCopy}; do
cp -r "$f" "$prefix/share/$name/$f" || true cp -r "$f" "$prefix/share/$name/$f" || true
@ -381,9 +381,28 @@ 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 ;};
realPhaseNames = args.phaseNames ++ createDirs = FullDepEntry (concatStringsSep ";"
(map (x: "ensureDir ${x}") (getAttr ["neededDirs"] [] args))
) ["minInit" "defEnsureDir"];
copyExtraDoc = FullDepEntry (''
name="$(basename $out)"
name="''${name#*-}"
ensureDir "$out/share/doc/$name"
'' + (concatStringsSep ";"
(map
(x: ''cp "${x}" "$out/share/doc/$name || true;"'')
(getAttr ["extraDoc"] [] args)))) ["minInit" "defEnsureDir" "doUnpack"];
realPhaseNames =
(optional ([] != getAttr ["neededDirs"] [] args) "createDirs")
++
args.phaseNames
++
["doForceShare" "doPropagate" "doForceCopy"] ["doForceShare" "doPropagate" "doForceCopy"]
++ ++
(optional ([] != getAttr ["extraDoc"] [] args) "copyExtraDoc")
++
(optional (getAttr ["doCheck"] false args) "doMakeCheck") (optional (getAttr ["doCheck"] false args) "doMakeCheck")
++ ++
(optional (getAttr ["alwaysFail"] false args) "doFail") (optional (getAttr ["alwaysFail"] false args) "doFail")