sgtpuzzles: fix broken gtk3 file dialog (#25694)

include wrapGAppsHook for file dialog to work
This commit is contained in:
Ole Jørgen Brønner 2017-05-11 08:52:43 +02:00 committed by Jörg Thalheim
parent fb0410c208
commit 6fef3228f9

View File

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