diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:43 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:43 +0100 |
commit | b3245241d8c630aa2b9435a7e31c50fdfba2a0a0 (patch) | |
tree | 7c5a9f88f7bd0f47d43a262d7a547779752bda24 /pkgs/games | |
parent | cd827f2209b35c4c3bdd5492c3e9a9d351e3e3b3 (diff) | |
parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
download | nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.gz nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.bz2 nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.lz nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.xz nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.zst nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/factorio/default.nix | 17 | ||||
-rw-r--r-- | pkgs/games/gcompris/default.nix | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 40df1b83cbc9..43ec92719c21 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL +, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , factorio-utils , releaseType , mods ? [] @@ -39,7 +39,7 @@ let the store using e.g.: releaseType=alpha - version=0.16.51 + version=0.17.74 nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz Note the ultimate "_" is replaced with "-" in the --name arg! @@ -52,15 +52,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; - experimental = bdist { sha256 = "1q66chnxsdlaz1bj3al62iikyxvknj1vkwh5bcc46favy4wpqpzz"; version = "0.17.52"; withAuth = true; }; + stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; + experimental = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; }; headless = { - stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; - experimental = bdist { sha256 = "03nv0qagv5pmqqbisf0hq6cb5rg2ih37lzkvcxihnnw72r78li94"; version = "0.17.52"; }; + stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; + experimental = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; }; demo = { - stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; + stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; }; }; i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { @@ -175,10 +175,11 @@ let headless = base; demo = base // { - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper libpulseaudio ]; libPath = stdenv.lib.makeLibraryPath [ alsaLib + libpulseaudio libX11 libXcursor libXinerama diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 874276f27203..67d52ac7bcb4 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "0.97"; + version = "0.98"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "1vy2b7vb11glack6p8x1mchxvc2j4l4q8h5fmxacgq8z2ali329b"; + sha256 = "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y"; }; cmakeFlags = [ |