From 6fef3228f9b7d1ab656f4ba5d7b36ea7b66cd299 Mon Sep 17 00:00:00 2001
From: Ole Jørgen Brønner <olejorgenb@yahoo.no>
Date: Thu, 11 May 2017 08:52:43 +0200
Subject: sgtpuzzles: fix broken gtk3 file dialog (#25694)

include wrapGAppsHook for file dialog to work
---
 pkgs/games/sgt-puzzles/default.nix | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 6718b3b0b5e6..bb9772dae72a 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -1,22 +1,25 @@
-{stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}:
-let
+{ stdenv, fetchurl
+, gtk3, libX11
+, makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "sgt-puzzles-r${version}";
   version = "20170228.1f613ba";
-  buildInputs = [
-    gtk3 pkgconfig libX11 perl automake115x autoconf
-  ];
-in
-stdenv.mkDerivation {
+
   src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
    sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5";
   };
-  name = "sgt-puzzles-r" + version;
-  inherit buildInputs;
+
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];
+
+  buildInputs = [ gtk3 libX11 ];
+
   makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
   preInstall = ''
     mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
     cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
-    cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE"
   '';
   # SGT Puzzles use generic names like net, map, etc.
   # Create symlinks with sgt-puzzle- prefix for possibility of
@@ -33,12 +36,11 @@ stdenv.mkDerivation {
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
     cp Makefile.gtk Makefile
   '';
-  meta = {
-    inherit version;
+  meta = with stdenv.lib; {
     description = "Simon Tatham's portable puzzle collection";
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     homepage = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
   };
 }
-- 
cgit 1.4.1