diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-11-25 21:31:09 +0100 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-11-25 21:37:30 +0100 |
commit | a41292792498e03024d682d092947c2153290073 (patch) | |
tree | b937402b60ea79cfa0e5562dad3268127a491d81 /pkgs/games/xsokoban | |
parent | 8a664fd5bc6b170bdf809030de6871fd6a454f5a (diff) | |
parent | b34a6c96ee14518b82648c5a8c1b29225c15d9df (diff) | |
download | nixpkgs-a41292792498e03024d682d092947c2153290073.tar nixpkgs-a41292792498e03024d682d092947c2153290073.tar.gz nixpkgs-a41292792498e03024d682d092947c2153290073.tar.bz2 nixpkgs-a41292792498e03024d682d092947c2153290073.tar.lz nixpkgs-a41292792498e03024d682d092947c2153290073.tar.xz nixpkgs-a41292792498e03024d682d092947c2153290073.tar.zst nixpkgs-a41292792498e03024d682d092947c2153290073.zip |
Merge remote-tracking branch 'origin/master' into closure-size
Diffstat (limited to 'pkgs/games/xsokoban')
-rw-r--r-- | pkgs/games/xsokoban/default.nix | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index af432fdb883..502771e18ee 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -1,51 +1,46 @@ -a @ {libX11, xproto, libXpm, libXt, ...} : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, libX11, xproto, libXpm, libXt }: + +stdenv.mkDerivation rec { + name = "xsokoban-${version}"; + version = "3.3c"; - version = a.lib.attrByPath ["version"] "3.3c" a; - buildInputs = with a; [ - a.libX11 a.xproto a.libXpm a.libXt - ]; -in -rec { src = fetchurl { - url = "http://www.cs.cornell.edu/andru/release/xsokoban-${version}.tar.gz"; + url = "http://www.cs.cornell.edu/andru/release/${name}.tar.gz"; sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9"; }; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"]; + buildInputs = [ libX11 xproto libXpm libXt ]; - preConfigure = a.fullDepEntry ('' + preConfigure = '' sed -e 's/getline/my_getline/' -i score.c - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm.dev}/include/X11" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXpm.dev}/include/X11" for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done chmod a+rw config.h - echo '#define HERE "@nixos-packaged"' >> config.h - echo '#define WWW 0' >> config.h - echo '#define OWNER "'$(whoami)'"' >> config.h - echo '#define ROOTDIR "'$out/lib/xsokoban'"' >> config.h - echo '#define ANYLEVEL 1' >> config.h - echo '#define SCOREFILE ".xsokoban-score"' >> config.h - echo '#define LOCKFILE ".xsokoban-score-lock"' >> config.h + cat >>config.h <<EOF + #define HERE "@nixos-packaged" + #define WWW 0 + #define OWNER "'$(whoami)'" + #define ROOTDIR "'$out/lib/xsokoban'" + #define ANYLEVEL 1 + #define SCOREFILE ".xsokoban-score" + #define LOCKFILE ".xsokoban-score-lock" + EOF - sed -e 's/getpass[(][^)]*[)]/PASSWORD/' -i main.c - sed -e '/if [(]owner[)]/iowner=1;' -i main.c - '') ["minInit" "doUnpack"]; + sed -i main.c \ + -e 's/getpass[(][^)]*[)]/PASSWORD/' \ + -e '/if [(]owner[)]/iowner=1;' + ''; - preBuild = a.fullDepEntry ('' - sed -e "s@/usr/local/@$out/@" -i Makefile - sed -e "s@ /bin/@ @" -i Makefile + preBuild = '' + sed -i Makefile \ + -e "s@/usr/local/@$out/@" \ + -e "s@ /bin/@ @" mkdir -p $out/bin $out/share $out/man/man1 $out/lib - '') ["minInit" "doConfigure" "defEnsureDir"]; + ''; - name = "xsokoban-" + version; - meta = { + meta = with stdenv.lib; { description = "X sokoban"; - license = a.stdenv.lib.licenses.publicDomain; - maintainers = [ a.stdenv.lib.maintainers.raskin ]; + license = licenses.publicDomain; + maintainers = [ maintainers.raskin ]; }; } |