diff options
| -rw-r--r-- | pkgs/build-support/builder-defs/builder-defs.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/lib/misc.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 5eaa40c611186..bca7fd7165971 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -319,6 +319,10 @@ let inherit (builtins) head tail trace; in doDump = n: noDepEntry "echo Dump number ${n}; set"; + doDumpBuildInputs = noDepEntry ('' + echo "${toString realBuildInputs}" + ''); + patchFlags = if args ? patchFlags then args.patchFlags else "-p1"; patches = attrByPath ["patches"] [] args; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 83765c8f006c3..bf5ecbaa44f6d 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -2,16 +2,16 @@ a : let fetchsvn = a.fetchsvn; - version = a.lib.attrByPath ["version"] "r8541" a; + version = a.lib.attrByPath ["version"] "r8541" a; buildInputs = with a; [ - gtk glib pkgconfig libX11 perl + gtk pkgconfig libX11 perl ]; in rec { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "8842"; - sha256 = "0rx3pxd1ci9x1mlw1jfmwd0fpcyv76vv6jraxfrxcykxx62qg479"; + rev = "8872"; + sha256 = "16hcrhkl6plzdhw60g7i4vgkxcc4mw4h4bzg2myy5cfhpx7y0m9s"; } + "/"; inherit buildInputs; @@ -26,11 +26,7 @@ rec { '' ["minInit" "doUnpack" "addInputs"]; /* doConfigure should be removed if not needed */ - phaseNames = ["addInputs" "doExport" "mkMakefiles" "doMakeInstall"]; - - doExport = a.noDepEntry '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11" - ''; + phaseNames = ["addInputs" "mkMakefiles" "doMakeInstall"]; name = "sgt-puzzles-" + version; meta = { diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 05e375dac1418..2cfd15735a749 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -196,10 +196,11 @@ rec { innerClosePropagation = ready: list: if list == [] then ready else - if (head list) ? propagatedBuildInputs then - innerClosePropagation (ready ++ [(head list)]) - ((head list).propagatedBuildInputs ++ (tail list)) else - innerClosePropagation (ready ++ [(head list)]) (tail list); + innerClosePropagation + (ready ++ [(head list)]) + ((tail list) + ++ (maybeAttr "propagatedBuildInputs" [] (head list)) + ++ (maybeAttr "propagatedBuildNativeInputs" [] (head list))); closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3675f98ba399f..ab6a5c63f3354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8522,7 +8522,7 @@ let }; sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) { - inherit (gtkLibs) gtk glib; + inherit (gtkLibs) gtk; inherit pkgconfig fetchsvn perl; inherit (xlibs) libX11; }; |