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

Merge pull request #80905 from bennofs/update-gnulib

Browse Source 
gnulib:  20190811 -> 20200223  and simplify usage
This commit is contained in:
Michael Raskin 2020-02-27 06:35:48 +00:00 committed by GitHub
commit 93f5b02c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/gnulib/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "gnulib"; pname = "gnulib";
version = "20190811"; version = "20200223";
src = fetchgit { src = fetchgit {
url = https://git.savannah.gnu.org/r/gnulib.git; url = https://git.savannah.gnu.org/r/gnulib.git;
rev = "6430babe47ece6953cf18ef07c1d8642c8588e89"; rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0";
sha256 = "14kgykbjly03dlb25sllcfcrpk7zkypa449gr3zbqv4rhpmnzizg"; sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw";
}; };
dontFixup = true; dontFixup = true;

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

@ -19,20 +19,18 @@ stdenv.mkDerivation rec {
--replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])" --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
autoconf automake gettext git gnulib autoconf automake gettext git gnulib
help2man libtool perl pkgconfig texinfo help2man libtool perl pkgconfig texinfo
]; ];
configurePhase = '' configurePhase = ''
cp -r "${gnulib}" gnulib ./bootstrap --gnulib-srcdir=${gnulib}
chmod a+rX,u+w -R gnulib
./bootstrap --gnulib-srcdir=gnulib
./configure --prefix="$out" ./configure --prefix="$out"
''; '';
buildInputs = [ buildInputs = [
libX11 libXScrnSaver libXext libX11 libXScrnSaver libXext
]; ];
meta = { meta = {

5
pkgs/tools/misc/grub/2.0x.nix
View File

@ -83,12 +83,9 @@ stdenv.mkDerivation rec {
unset CPP # setting CPP intereferes with dependency calculation unset CPP # setting CPP intereferes with dependency calculation
cp -r ${gnulib} $PWD/gnulib
chmod u+w -R $PWD/gnulib
patchShebangs . patchShebangs .
./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib ./bootstrap --no-git --gnulib-srcdir=${gnulib}
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
''; '';