From a858113076b9012664237eb619b9289936b187a9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 27 Nov 2018 19:54:15 -0600 Subject: [PATCH] oneko: use imake setup hook Simplifies some things here. --- pkgs/applications/misc/oneko/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index e1cc70e4277..311f093ba6d 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xlibsWrapper }: +{ stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }: stdenv.mkDerivation rec { version = "1.2.sakura.5"; @@ -8,14 +8,11 @@ stdenv.mkDerivation rec { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; }; - buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ]; + nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ xlibsWrapper ]; - configurePhase = "xmkmf"; - - installPhase = '' - make install BINDIR=$out/bin - make install.man MANPATH=$out/share/man - ''; + makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; + installTargets = "install install.man"; meta = with stdenv.lib; { description = "Creates a cute cat chasing around your mouse cursor";