From 1faafc8b8659336004a70236b6fa7c7dffbd3544 Mon Sep 17 00:00:00 2001 From: Danyil Bohdan Date: Tue, 3 Feb 2015 12:00:59 +0100 Subject: [PATCH] tcl2048: update to 0.3.1, fix tclsh path. Also add self as maintainer. --- pkgs/games/tcl2048/builder.sh | 5 ----- pkgs/games/tcl2048/default.nix | 23 +++++++++++++++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 pkgs/games/tcl2048/builder.sh diff --git a/pkgs/games/tcl2048/builder.sh b/pkgs/games/tcl2048/builder.sh deleted file mode 100644 index b34441cdc996..000000000000 --- a/pkgs/games/tcl2048/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/bin -cp $src $out/bin/2048 -chmod +x $out/bin/2048 diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index fac28ce2fd94..d1517a2ec619 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,19 +1,34 @@ { stdenv, fetchurl, tcl, tcllib }: stdenv.mkDerivation { - name = "tcl2048-0.2.6"; + name = "tcl2048-0.3.1"; src = fetchurl { - url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.6/2048.tcl; - sha256 = "481eac7cccc37d1122c3069da6186f584906bd27b86b8d4ae1a2d7e355c1b6b2"; + url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.3.1/2048.tcl; + sha256 = "44e325328784c4e91cecc0a9cc00e32d733da713adf2fad1c081542f38af3361"; }; - builder = ./builder.sh; + phases = "installPhase"; + + installPhase = '' + mkdir -pv $out/bin + cp $src $out/2048.tcl + cat > $out/bin/2048 << EOF + #!${stdenv.shell} + + # wrapper for tcl2048 + export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" + ${tcl}/bin/tclsh $out/2048.tcl + EOF + + chmod +x $out/bin/2048 + ''; meta = { homepage = https://github.com/dbohdan/2048-tcl; description = "The game of 2048 implemented in Tcl"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ dbohdan ]; }; }