diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2015-07-05 11:57:38 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2015-07-05 11:57:49 +0300 |
commit | af3d395cfe4666973e4cf4105a1b05b509ff1bab (patch) | |
tree | b34717d4251d63dade63f24ef188ae72fbfb1757 /pkgs/games/sgt-puzzles | |
parent | 2467c437b7103f5895c163b56484420c5ecc5553 (diff) |
sgtpuzzles: update to revision 10286; rewrite completely to avoid reliance on builderDefs features
Diffstat (limited to 'pkgs/games/sgt-puzzles')
-rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 8aaf1f0865c4d..67f74be9e1cd4 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,40 +1,35 @@ -a : -let - fetchsvn = a.fetchsvn; - - version = a.lib.attrByPath ["version"] "r8541" a; - buildInputs = with a; [ +{stdenv, gtk, pkgconfig, libX11, perl, fetchsvn}: +let + version = "10286"; + buildInputs = [ gtk pkgconfig libX11 perl ]; in -rec { +stdenv.mkDerivation { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "9773"; - sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611"; - } + "/"; - + rev = version; + sha256 = "1mp1s33hjikby7jy6bcjwyzkdwlw1bw9dcc4cg5d80wmzkb0sqv0"; + }; + name = "sgt-puzzles-r" + version; inherit buildInputs; - configureFlags = []; - makeFlags = ["prefix=$out" "gamesdir=$out/bin"]; - - neededDirs = ["$out/bin" "$out/share"]; - extraDoc = ["puzzles.txt"]; - - mkMakefiles = a.fullDepEntry '' + makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"]; + preInstall = '' + mkdir -p "$out"/{bin,share/doc/sgtpuzzles} + cp puzzles.txt LICENCE README "$out/share/doc/sgtpuzzles" + cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE" + ''; + preConfigure = '' perl mkfiles.pl - '' ["minInit" "doUnpack" "addInputs"]; - - setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" 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 = { + inherit version; description = "Simon Tatham's portable puzzle collection"; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; } |