Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2 files changed, 10 insertions, 8 deletions

diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index af4f6e2c7ec9..12f8efd7325a 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchgit, cmake, zlib, boost,
   openal, glm, freetype, mesa, glew, SDL2,
-  dejavu_fonts }:
+  dejavu_fonts, inkscape, optipng, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "arx-libertatis-${version}";
-  version = "2016-02-02";
+  version = "2016-07-27";
 
   src = fetchgit {
     url = "https://github.com/arx/ArxLibertatis";
-    rev = "205c6cda4d5ac10f3af4ea7bb89c2fc88dac7c9a";
-    sha256 = "0dy81pk4r94qq720kk6ynkjp2wr3z9hzm9h1x46nkkpn7fj8srrn";
+    rev = "e3aa6353f90886e7e9db2f4350ad9a232dd01c1e";
+    sha256 = "1hkkf0z607z8wxdikxq1ji120b3w7pxixq9qapdj1p54dzgbhgza";
   };
 
   buildInputs = [
     cmake zlib boost openal glm
-    freetype mesa glew SDL2
+    freetype mesa glew SDL2 inkscape
+    optipng imagemagick
   ];
 
   preConfigure = ''
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 345840af2493..404b3b90d7cd 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }:
 stdenv.mkDerivation rec {
   name = "chessx-${version}";
-  version = "1.3.2";
+  version = "1.4.0";
   src = fetchurl {
     url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
-    sha256 = "b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff";
+    sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74";
   };
   buildInputs = [
    stdenv
@@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   installPhase = ''
+      runHook preInstall
       mkdir -p "$out/bin"
       mkdir -p "$out/share/applications"
       cp -pr release/chessx "$out/bin"
       cp -pr unix/chessx.desktop "$out/share/applications"
+      runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -30,6 +32,5 @@ stdenv.mkDerivation rec {
     description = "ChessX allows you to browse and analyse chess games";
     license = licenses.gpl2;
     maintainers = [maintainers.luispedro];
-    broken = true;
   };
 }