From 33bb2c8e6b51f3d994f4185bf411425bbe531ea6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 4 Apr 2015 20:31:55 -0700 Subject: [PATCH] gpm: 1.20.6 -> 1.20.7 --- pkgs/servers/gpm/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 6572e63a14f..011b0b8ff49 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, flex, bison, ncurses }: +{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, ncurses, texinfo }: stdenv.mkDerivation rec { - name = "gpm-1.20.6"; + name = "gpm-1.20.7"; src = fetchurl { url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; - sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8"; + sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; }; - nativeBuildInputs = [ flex bison ]; - buildInputs = [ ncurses ]; + buildInputs = [ automake autoconf libtool flex bison ncurses texinfo ]; - preConfigure = - '' - sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in - ''; + preConfigure = '' + ./autogen.sh + sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in + ''; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; # Its configure script does not allow --disable-static # Disabling this, we make cross-builds easier, because having