diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-02-27 06:35:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 06:35:48 +0000 |
| commit | 93f5b02c4f887b381ae993dde9bd1c29de844db4 (patch) | |
| tree | fce82b9c671bc728a47ff91c7f4a511237faf52f | |
| parent | 8706ed24e579c19bcf8281b60d1ac2f638b73bf1 (diff) | |
| parent | 98bb71f41b194f00607308fab704397a9aaf971d (diff) | |
| download | nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.tar nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.tar.gz nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.tar.bz2 nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.tar.lz nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.tar.xz nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.tar.zst nixlib-93f5b02c4f887b381ae993dde9bd1c29de844db4.zip | |
Merge pull request #80905 from bennofs/update-gnulib
gnulib: 20190811 -> 20200223 and simplify usage
| -rw-r--r-- | pkgs/development/tools/gnulib/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/X11/xprintidle-ng/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 5 |
3 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 316c38706d3d..368a1520ca00 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "gnulib"; - version = "20190811"; + version = "20200223"; src = fetchgit { url = https://git.savannah.gnu.org/r/gnulib.git; - rev = "6430babe47ece6953cf18ef07c1d8642c8588e89"; - sha256 = "14kgykbjly03dlb25sllcfcrpk7zkypa449gr3zbqv4rhpmnzizg"; + rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; + sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; }; dontFixup = true; diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 117a612381f6..4ae457dab4a8 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -19,20 +19,18 @@ stdenv.mkDerivation rec { --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])" ''; - nativeBuildInputs = [ + nativeBuildInputs = [ autoconf automake gettext git gnulib help2man libtool perl pkgconfig texinfo ]; configurePhase = '' - cp -r "${gnulib}" gnulib - chmod a+rX,u+w -R gnulib - ./bootstrap --gnulib-srcdir=gnulib + ./bootstrap --gnulib-srcdir=${gnulib} ./configure --prefix="$out" ''; buildInputs = [ - libX11 libXScrnSaver libXext + libX11 libXScrnSaver libXext ]; meta = { diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 3f5485718dc5..3eec453824d7 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -83,12 +83,9 @@ stdenv.mkDerivation rec { unset CPP # setting CPP intereferes with dependency calculation - cp -r ${gnulib} $PWD/gnulib - chmod u+w -R $PWD/gnulib - patchShebangs . - ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib + ./bootstrap --no-git --gnulib-srcdir=${gnulib} substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; |