From d697a404ab8ded5ba043a25f9ffe83a3d600a051 Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Sun, 11 Feb 2018 17:31:35 +0100 Subject: [PATCH] xjump: taking review into account --- pkgs/games/xjump/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index 7fd89777a9e..520b7ccdfb9 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gcc, autoconf, automake, xorg, ... }: +{ stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?"/var" }: stdenv.mkDerivation rec { name = "xjump-${version}"; @@ -9,19 +9,13 @@ stdenv.mkDerivation rec { rev = "e7f20fb8c2c456bed70abb046c1a966462192b80"; sha256 = "0hq4739cvi5a47pxdc0wwkj2lmlqbf1xigq0v85qs5bq3ixmq2f7"; }; - buildInputs = [ gcc autoconf automake xorg.libX11 xorg.libXt xorg.libXpm xorg.libXaw ]; - preConfigure = '' - autoreconf --install - ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/xjump - install -m 755 xjump $out/bin - cp -R themes $out/share/xjump - ''; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libX11 libXt libXpm libXaw ]; + preConfigure = "autoreconf --install"; + configureFlags = ["--localstatedir=${localStateDir}"]; + meta = with stdenv.lib; { description = "The falling tower game"; maintainers = with maintainers; [ pmeunier ]; - platforms = platforms.linux; }; }