diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/games | |
parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/eduke32/default.nix | 68 | ||||
-rw-r--r-- | pkgs/games/super-tux-kart/default.nix | 2 |
2 files changed, 36 insertions, 34 deletions
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index cc47f9482404..e7a420b894a1 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,68 +1,70 @@ -{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}: +{ stdenv, fetchurl, flac, gtk, libvorbis, libvpx, makeDesktopItem, mesa, nasm +, pkgconfig, SDL2, SDL2_mixer }: -stdenv.mkDerivation rec { - name = "eduke32-20130303-3542"; +let + date = "20150420"; + rev = "5160"; + version = "${date}-${rev}"; +in stdenv.mkDerivation rec { + name = "eduke32-${version}"; src = fetchurl { - url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2; - sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz"; + sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ] + buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; - NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s"; + postPatch = '' + substituteInPlace build/src/glbuild.c \ + --replace libGL.so ${mesa}/lib/libGL.so \ + --replace libGLU.so ${mesa}/lib/libGLU.so + ''; + + NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL"; + NIX_LDFLAGS = "-L${SDL2}/lib"; + + makeFlags = "LINKED_GTK=1 SDLCONFIG=${SDL2}/bin/sdl2-config VC_REV=${rev}"; desktopItem = makeDesktopItem { name = "eduke32"; exec = "eduke32-wrapper"; comment = "Duke Nukem 3D port"; - desktopName = "EDuke32"; + desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; categories = "Application;Game;"; }; - preConfigure = '' - sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared - ''; - - buildPhase = '' - make OPTLEVEL=0 USE_LIBPNG=0 - ''; - installPhase = '' - # Install binaries - mkdir -p $out/bin - cp eduke32 mapster32 $out/bin - # Make wrapper script - cat > $out/bin/eduke32-wrapper <<EOF + cat > eduke32-wrapper <<EOF #!/bin/sh - if [ "$EDUKE32_DATA_DIR" = "" ] - then + if [ "$EDUKE32_DATA_DIR" = "" ]; then EDUKE32_DATA_DIR=/var/lib/games/eduke32 fi - if [ "$EDUKE32_GRP_FILE" = "" ] - then + if [ "$EDUKE32_GRP_FILE" = "" ]; then EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP fi cd \$EDUKE32_DATA_DIR - eduke32 -g \$EDUKE32_GRP_FILE + exec $out/bin/eduke32 -g \$EDUKE32_GRP_FILE EOF - chmod 755 $out/bin/eduke32-wrapper + + # Install binaries + mkdir -p $out/bin + install -Dm755 eduke32{,-wrapper} mapster32 $out/bin # Install desktop item - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + cp -rv ${desktopItem}/share $out ''; - meta = { + meta = with stdenv.lib; { + inherit version; description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = stdenv.lib.licenses.gpl2Plus; + license = with licenses; gpl2Plus; homepage = http://eduke32.com; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = with maintainers; [ nckx sander ]; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index db42572de5eb..f3574d137d39 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "SuperTuxKart is a Free 3D kart racing game"; + description = "A Free 3D kart racing game"; longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, characters and items for you to try, similar in spirit to Mario |