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

sgtpuzzles: update to revision 10286; rewrite completely to avoid reliance on builderDefs features

Browse Source
This commit is contained in:
Michael Raskin 2015-07-05 11:57:38 +03:00
parent 2467c437b7
commit af3d395cfe
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,40 +1,35 @@
a : {stdenv, gtk, pkgconfig, libX11, perl, fetchsvn}:
let let
fetchsvn = a.fetchsvn; version = "10286";
buildInputs = [
version = a.lib.attrByPath ["version"] "r8541" a;
buildInputs = with a; [
gtk pkgconfig libX11 perl gtk pkgconfig libX11 perl
]; ];
in in
rec { stdenv.mkDerivation {
src = fetchsvn { src = fetchsvn {
url = svn://svn.tartarus.org/sgt/puzzles; url = svn://svn.tartarus.org/sgt/puzzles;
rev = "9773"; rev = version;
sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611"; sha256 = "1mp1s33hjikby7jy6bcjwyzkdwlw1bw9dcc4cg5d80wmzkb0sqv0";
} + "/"; };
name = "sgt-puzzles-r" + version;
inherit buildInputs; inherit buildInputs;
configureFlags = []; makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
makeFlags = ["prefix=$out" "gamesdir=$out/bin"]; preInstall = ''
mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
neededDirs = ["$out/bin" "$out/share"]; cp puzzles.txt LICENCE README "$out/share/doc/sgtpuzzles"
extraDoc = ["puzzles.txt"]; cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE"
'';
mkMakefiles = a.fullDepEntry '' preConfigure = ''
perl mkfiles.pl perl mkfiles.pl
'' ["minInit" "doUnpack" "addInputs"];
setVars = a.noDepEntry ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
cp Makefile.gtk Makefile
''; '';
/* doConfigure should be removed if not needed */
phaseNames = ["addInputs" "setVars" "mkMakefiles" "doMakeInstall"];
name = "sgt-puzzles-" + version;
meta = { meta = {
inherit version;
description = "Simon Tatham's portable puzzle collection"; description = "Simon Tatham's portable puzzle collection";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
}; };
} }

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

@ -13613,10 +13613,7 @@ let
sdlmame = callPackage ../games/sdlmame { }; sdlmame = callPackage ../games/sdlmame { };
sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) { sgtpuzzles = callPackage (import ../games/sgt-puzzles) { };
inherit pkgconfig fetchsvn perl gtk;
inherit (xlibs) libX11;
};
simutrans = callPackage ../games/simutrans { }; simutrans = callPackage ../games/simutrans { };
# get binaries without data built by Hydra # get binaries without data built by Hydra