diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-22 08:37:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-22 08:37:19 +0200 |
| commit | 7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6 (patch) | |
| tree | 8a93add14237193577c4e6297be82218a42dd3d2 /pkgs/games | |
| parent | e7a68aa11100cc0f97c74b95792792b7f0396adc (diff) | |
| parent | 479dc4a80dcb8f276dadd1e801d64dde0e6c8888 (diff) | |
| download | nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.tar nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.tar.gz nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.tar.bz2 nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.tar.lz nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.tar.xz nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.tar.zst nixpkgs-7a5c6fee0f5fd2d0c69658e4371f08ef6c9b75f6.zip | |
Merge branch 'master' into staging-next
Some rebuilds, e.g. all of haskell. Hydra nixpkgs: ?compare=1601713
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/arx-libertatis/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/factorio/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 8b2cf83e509..2e60f81f4d3 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, zlib, boost , openal, glm, freetype, libGLU, SDL2, epoxy -, dejavu_fonts, inkscape, optipng, imagemagick +, dejavu_fonts, inkscape_0, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin , qtbase ? null , wrapQtAppsHook ? null @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - cmake inkscape imagemagick optipng + cmake inkscape_0 imagemagick optipng ] ++ optionals withCrashReporter [ wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 79e507e13a8..d8770addf66 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1idhq836xk1qvhlval28rskqkw06x8hh0izfw9vsf06xym2knkyf"; version = "0.18.34"; withAuth = true; }; + experimental = bdist { sha256 = "0la4590lf4gssdcf29qm73mz901dnp7cii712fcqw382qh9hbl9q"; version = "0.18.36"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "05kvb8al7x0as62q6bwk89lmvnjdvsmcm3ahgghl5zzz38rrzbwd"; version = "0.18.34"; }; + experimental = bdist { sha256 = "0d64zzvp6zwz6p2izhhj998b6z8wd6r1b5p8mz1sbpz3v91sazj7"; version = "0.18.36"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; |