swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58416 from dtzWill/update/gnulib-2019

Browse source 
gnulib: 20180226 -> 20190326
This commit is contained in:
Renaud 2019-04-25 23:09:14 +02:00 committed by GitHub
parent a682d720c7 e2fd7276a9
commit f3558ac51e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/tools/gnulib/default.nix
View file

@ -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;

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

@ -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;
};