diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2019-04-25 19:13:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-25 19:13:47 +0200 |
commit | e2fd7276a9067d07ac86c1dae367ed03248279b2 (patch) | |
tree | fb82ba037c588d72e4f3d8ccbccd68c98969049f /pkgs/tools/X11 | |
parent | f7505eea1464b4d1629e89d0e285ff24425b66a8 (diff) | |
download | nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.tar nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.tar.gz nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.tar.bz2 nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.tar.lz nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.tar.xz nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.tar.zst nixpkgs-e2fd7276a9067d07ac86c1dae367ed03248279b2.zip |
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
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/xprintidle-ng/default.nix | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 7ddab964436..117a612381f 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 { + pname = "xprintidle-ng"; 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 - ]; 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; }; |