From f7505eea1464b4d1629e89d0e285ff24425b66a8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 26 Mar 2019 15:41:54 -0500
Subject: [PATCH 1/2] gnulib: 20180226 -> 20190326

---
 pkgs/development/tools/gnulib/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index 18af16d36525..15042353b1d5 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnulib-20180226";
+  pname = "gnulib";
+  version = "20190326";
 
   src = fetchgit {
-    url = "https://git.savannah.gnu.org/r/gnulib.git";
-    rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
-    sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
+    url = https://git.savannah.gnu.org/r/gnulib.git;
+    rev = "a18f7ce3c0aa760c33d46bbeb8e5b3a14cf24984";
+    sha256 = "04py5n3j17wyqv9wfsslcrxzapni9vmw6p5g0adzy2md3ygjw4x4";
   };
 
   dontFixup = true;

From e2fd7276a9067d07ac86c1dae367ed03248279b2 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 25 Apr 2019 19:13:47 +0200
Subject: [PATCH 2/2] xprintidle-ng: refactor and patch configure.ac

configure.ac needs to be patched in order to build with newer gnulib
See https://github.com/NixOS/nixpkgs/pull/58416
---
 pkgs/tools/X11/xprintidle-ng/default.nix | 32 ++++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix
index 7ddab964436b..117a612381f6 100644
--- a/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/pkgs/tools/X11/xprintidle-ng/default.nix
@@ -2,23 +2,28 @@
   , autoconf, automake, libtool, gettext, pkgconfig
   , git, perl, texinfo, help2man
 }:
-stdenv.mkDerivation rec {
-  version = "git-2015-09-01";
-  name = "${baseName}-${version}";
-  baseName = "xprintidle-ng";
 
-  buildInputs = [
-    libX11 libXScrnSaver libXext gnulib
-    autoconf automake libtool gettext pkgconfig  git perl 
-    texinfo help2man
-    ];
+stdenv.mkDerivation rec {
+  pname = "xprintidle-ng";
+  version = "git-2015-09-01";
+
   src = fetchFromGitHub {
     owner = "taktoa";
-    repo = "${baseName}";
+    repo = pname;
     rev = "9083ba284d9222541ce7da8dc87d5a27ef5cc592";
     sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq";
   };
 
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])"
+  '';
+
+  nativeBuildInputs = [ 
+    autoconf automake gettext git gnulib
+    help2man libtool perl pkgconfig texinfo
+  ];
+
   configurePhase = ''
     cp -r "${gnulib}" gnulib
     chmod a+rX,u+w -R gnulib
@@ -26,10 +31,15 @@ stdenv.mkDerivation rec {
     ./configure --prefix="$out"
   '';
 
+  buildInputs = [
+    libX11 libXScrnSaver libXext  
+  ];
+
   meta = {
     inherit  version;
     description = ''A command-line tool to print idle time from libXss'';
-    license = stdenv.lib.licenses.gpl2 ;
+    homepage = http://taktoa.me/xprintidle-ng/;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
   };