diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-15 05:31:31 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-15 05:36:05 +0000 |
| commit | 3dded417f6510641fb0c0011cc1243608a9f0e9f (patch) | |
| tree | aa85c90337587959694a4d791735639b740d963d | |
| parent | 223236dfc67b17bf8a2270b644d96fe542e9d816 (diff) | |
| download | nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.tar nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.tar.gz nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.tar.bz2 nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.tar.lz nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.tar.xz nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.tar.zst nixpkgs-3dded417f6510641fb0c0011cc1243608a9f0e9f.zip | |
gtetrinet: prevent warnings and fix style
| -rw-r--r-- | pkgs/games/gtetrinet/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 17 insertions, 18 deletions
diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index a8695e54ad9..f1c24ba4de8 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5bf480df6b..033e2df26e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |