gtetrinet: prevent warnings and fix style
This commit is contained in:
parent
223236dfc6
commit
3dded417f6
2 changed files with 15 additions and 16 deletions
|
@ -1,5 +1,4 @@
|
||||||
{ fetchFromGitHub, stdenv
|
{ fetchFromGitHub, stdenv, autoreconfHook, intltool, pkgconfig, libgnome, libgnomeui, GConf }:
|
||||||
, perl, perlPackages, gnome2, intltool, pkgconfig, autoconf, automake }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "gtetrinet-0.7.11";
|
name = "gtetrinet-0.7.11";
|
||||||
|
@ -11,28 +10,26 @@ stdenv.mkDerivation {
|
||||||
sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93";
|
sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
|
||||||
perl
|
|
||||||
perlPackages.XMLParser
|
|
||||||
intltool
|
|
||||||
gnome2.libgnome
|
|
||||||
gnome2.libgnomeui
|
|
||||||
pkgconfig
|
|
||||||
autoconf
|
|
||||||
automake
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedUserEnvPkgs = [ gnome2.GConf ];
|
buildInputs = [ libgnome libgnomeui ];
|
||||||
|
|
||||||
preConfigure = ''
|
propagatedUserEnvPkgs = [ GConf ];
|
||||||
autoreconf --install --force --verbose
|
|
||||||
|
postAutoreconf = ''
|
||||||
intltoolize --force
|
intltoolize --force
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
preInstall = ''
|
||||||
|
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mv "$out/games" "$out/bin"
|
mv "$out/games" "$out/bin"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Client for Tetrinet, a multiplayer online Tetris game.";
|
description = "Client for Tetrinet, a multiplayer online Tetris game.";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
|
|
@ -17859,7 +17859,9 @@ with pkgs;
|
||||||
|
|
||||||
gogui = callPackage ../games/gogui {};
|
gogui = callPackage ../games/gogui {};
|
||||||
|
|
||||||
gtetrinet = callPackage ../games/gtetrinet { };
|
gtetrinet = callPackage ../games/gtetrinet {
|
||||||
|
inherit (gnome2) GConf libgnome libgnomeui;
|
||||||
|
};
|
||||||
|
|
||||||
gtypist = callPackage ../games/gtypist { };
|
gtypist = callPackage ../games/gtypist { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue