From fc90bc4c542957b6c5ad4e58fdf7f8faab276364 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 15 Jan 2010 11:46:12 +0000 Subject: [PATCH] Update SGT Puzzles source. Use SVN to solve the problem with disappearing source svn path=/nixpkgs/trunk/; revision=19465 --- pkgs/games/sgt-puzzles/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 26b15f3940d9..83765c8f006c 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,17 +1,18 @@ a : let - fetchurl = a.fetchurl; + fetchsvn = a.fetchsvn; version = a.lib.attrByPath ["version"] "r8541" a; buildInputs = with a; [ - gtk glib pkgconfig libX11 + gtk glib pkgconfig libX11 perl ]; in rec { - src = fetchurl { - url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "1m6fybbvlx33786hmgraqxgm1hakfj9bqqszzzpi2ka4spfzj3xl"; - }; + src = fetchsvn { + url = svn://svn.tartarus.org/sgt/puzzles; + rev = "8842"; + sha256 = "0rx3pxd1ci9x1mlw1jfmwd0fpcyv76vv6jraxfrxcykxx62qg479"; + } + "/"; inherit buildInputs; configureFlags = []; @@ -20,8 +21,12 @@ rec { neededDirs = ["$out/bin" "$out/share" ""]; extraDoc = ["puzzles.txt"]; + mkMakefiles = a.fullDepEntry '' + perl mkfiles.pl + '' ["minInit" "doUnpack" "addInputs"]; + /* doConfigure should be removed if not needed */ - phaseNames = ["addInputs" "doExport" "doMakeInstall"]; + phaseNames = ["addInputs" "doExport" "mkMakefiles" "doMakeInstall"]; doExport = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"