dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge

Browse Source 
svn path=/nixpkgs/trunk/; revision=20093
This commit is contained in:
Michael Raskin 2010-02-18 10:29:40 +00:00
parent 5fc64e5f9c
commit 89d1b7881f
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/builder-defs/builder-defs.nix
View File

@ -319,6 +319,10 @@ let inherit (builtins) head tail trace; in
doDump = n: noDepEntry "echo Dump number ${n}; set"; doDump = n: noDepEntry "echo Dump number ${n}; set";
doDumpBuildInputs = noDepEntry (''
echo "${toString realBuildInputs}"
'');
patchFlags = if args ? patchFlags then args.patchFlags else "-p1"; patchFlags = if args ? patchFlags then args.patchFlags else "-p1";
patches = attrByPath ["patches"] [] args; patches = attrByPath ["patches"] [] args;

14
pkgs/games/sgt-puzzles/default.nix
View File

@ -2,16 +2,16 @@ a :
let let
fetchsvn = a.fetchsvn; fetchsvn = a.fetchsvn;
version = a.lib.attrByPath ["version"] "r8541" a; version = a.lib.attrByPath ["version"] "r8541" a;
buildInputs = with a; [ buildInputs = with a; [
gtk glib pkgconfig libX11 perl gtk pkgconfig libX11 perl
]; ];
in in
rec { rec {
src = fetchsvn { src = fetchsvn {
url = svn://svn.tartarus.org/sgt/puzzles; url = svn://svn.tartarus.org/sgt/puzzles;
rev = "8842"; rev = "8872";
sha256 = "0rx3pxd1ci9x1mlw1jfmwd0fpcyv76vv6jraxfrxcykxx62qg479"; sha256 = "16hcrhkl6plzdhw60g7i4vgkxcc4mw4h4bzg2myy5cfhpx7y0m9s";
} + "/"; } + "/";
inherit buildInputs; inherit buildInputs;
@ -26,11 +26,7 @@ rec {
'' ["minInit" "doUnpack" "addInputs"]; '' ["minInit" "doUnpack" "addInputs"];
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["addInputs" "doExport" "mkMakefiles" "doMakeInstall"]; phaseNames = ["addInputs" "mkMakefiles" "doMakeInstall"];
doExport = a.noDepEntry ''
export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
'';
name = "sgt-puzzles-" + version; name = "sgt-puzzles-" + version;
meta = { meta = {

9
pkgs/lib/misc.nix
View File

@ -196,10 +196,11 @@ rec {
innerClosePropagation = ready: list: if list == [] then ready else innerClosePropagation = ready: list: if list == [] then ready else
if (head list) ? propagatedBuildInputs then innerClosePropagation
innerClosePropagation (ready ++ [(head list)]) (ready ++ [(head list)])
((head list).propagatedBuildInputs ++ (tail list)) else ((tail list)
innerClosePropagation (ready ++ [(head list)]) (tail list); ++ (maybeAttr "propagatedBuildInputs" [] (head list))
++ (maybeAttr "propagatedBuildNativeInputs" [] (head list)));
closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});

2
pkgs/top-level/all-packages.nix
View File

@ -8522,7 +8522,7 @@ let
}; };
sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) { sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk;
inherit pkgconfig fetchsvn perl; inherit pkgconfig fetchsvn perl;
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };