Permalink
Browse files

gtetrinet: prevent warnings and fix style

  • Loading branch information...
orivej committed Nov 15, 2017
1 parent 223236d commit 3dded417f6510641fb0c0011cc1243608a9f0e9f
Showing with 17 additions and 18 deletions.
  1. +14 −17 pkgs/games/gtetrinet/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
@@ -1,5 +1,4 @@
{ fetchFromGitHub, stdenv
, perl, perlPackages, gnome2, intltool, pkgconfig, autoconf, automake }:
{ fetchFromGitHub, stdenv, autoreconfHook, intltool, pkgconfig, libgnome, libgnomeui, GConf }:
stdenv.mkDerivation {
name = "gtetrinet-0.7.11";
@@ -11,28 +10,26 @@ stdenv.mkDerivation {
sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93";
};
buildInputs = [
perl
perlPackages.XMLParser
intltool
gnome2.libgnome
gnome2.libgnomeui
pkgconfig
autoconf
automake
];
propagatedUserEnvPkgs = [ gnome2.GConf ];
preConfigure = ''
autoreconf --install --force --verbose
nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
buildInputs = [ libgnome libgnomeui ];
propagatedUserEnvPkgs = [ GConf ];
postAutoreconf = ''
intltoolize --force
'';
preInstall = ''
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
'';
postInstall = ''
mv "$out/games" "$out/bin"
'';
enableParallelBuilding = true;
meta = {
description = "Client for Tetrinet, a multiplayer online Tetris game.";
longDescription = ''
@@ -17859,7 +17859,9 @@ with pkgs;
gogui = callPackage ../games/gogui {};
gtetrinet = callPackage ../games/gtetrinet { };
gtetrinet = callPackage ../games/gtetrinet {
inherit (gnome2) GConf libgnome libgnomeui;
};
gtypist = callPackage ../games/gtypist { };

0 comments on commit 3dded41

Please sign in to comment.