diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
| commit | f037625f87b0b1d8852a1f31ebaece5fdbc87a2b (patch) | |
| tree | af8c8369954890db69195a1e9394ce16c7640d7f /pkgs/games | |
| parent | f08d6f0e2daf9f3d9daa070eee223855b33c430d (diff) | |
| parent | 4e22e88b914ffb63393449c5e20fe8843a7ce93b (diff) | |
| download | nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.gz nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.bz2 nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.lz nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.xz nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.zst nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.zip | |
Merge remote-tracking branch 'upstream/staging' into deps-reorg
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/minecraft-server/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/trackballs/default.nix | 35 |
2 files changed, 13 insertions, 26 deletions
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 1e8ec2b8a6a8..16e0c05e0e2c 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.12"; + version = "1.12.2"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "02fwlg4c9kqckmdi9wxi64jdqynj5myp0995aabc07746hwgzszy"; + sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; }; preferLocalBuild = true; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 5606be6a5943..93dd579b4e0c 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,35 +1,22 @@ -{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile -, debug ? false }: +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, mesa }: with stdenv.lib; stdenv.mkDerivation rec { - name = "trackballs-1.1.4"; - - src = fetchurl { - url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz; - sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5"; + name = "trackballs-${version}"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "trackballs"; + repo = "trackballs"; + rev = "v${version}"; + sha256 = "13f28frni7fkalxx4wqvmkzz7ba3d8pic9f9sd2z9wa6gbjs9zrf"; }; - buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ]; - - hardeningDisable = [ "format" ]; - - CFLAGS = optionalString debug "-g -O0"; - CXXFLAGS = CFLAGS; - dontStrip = debug; - postUnpack = optionalString debug - "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; - - NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL"; - configureFlags = optionalString debug "--enable-debug"; - - patchPhase = '' - sed -i -e 's/images icons music/images music/' share/Makefile.in - ''; + buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext mesa ]; meta = { - homepage = http://trackballs.sourceforge.net/; + homepage = https://trackballs.github.io/; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; }; |