JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xprintidle-ng: refactor and patch configure.ac

Browse Source 
configure.ac needs to be patched in order to build with newer gnulib
See https://github.com/NixOS/nixpkgs/pull/58416
This commit is contained in:
Renaud 2019-04-25 19:13:47 +02:00 committed by GitHub
parent f7505eea14
commit e2fd7276a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/tools/X11/xprintidle-ng/default.nix
View File

@ -2,23 +2,28 @@
, autoconf, automake, libtool, gettext, pkgconfig , autoconf, automake, libtool, gettext, pkgconfig
, git, perl, texinfo, help2man , git, perl, texinfo, help2man
}: }:
stdenv.mkDerivation rec {
version = "git-2015-09-01";
name = "${baseName}-${version}";
baseName = "xprintidle-ng";
buildInputs = [ stdenv.mkDerivation rec {
libX11 libXScrnSaver libXext gnulib pname = "xprintidle-ng";
autoconf automake libtool gettext pkgconfig git perl version = "git-2015-09-01";
texinfo help2man
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "taktoa"; owner = "taktoa";
repo = "${baseName}"; repo = pname;
rev = "9083ba284d9222541ce7da8dc87d5a27ef5cc592"; rev = "9083ba284d9222541ce7da8dc87d5a27ef5cc592";
sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq"; 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 = '' configurePhase = ''
cp -r "${gnulib}" gnulib cp -r "${gnulib}" gnulib
chmod a+rX,u+w -R gnulib chmod a+rX,u+w -R gnulib
@ -26,10 +31,15 @@ stdenv.mkDerivation rec {
./configure --prefix="$out" ./configure --prefix="$out"
''; '';
buildInputs = [
libX11 libXScrnSaver libXext
];
meta = { meta = {
inherit version; inherit version;
description = ''A command-line tool to print idle time from libXss''; 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]; maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };