Merge pull request #266557 from anthonyroussel/updates/gnulib

{ lib, stdenv, fetchgit, python3 }:

{ lib, stdenv, fetchFromSavannah, python3 }:

stdenv.mkDerivation {

stdenv.mkDerivation rec {

  pname = "gnulib";

  version = "20210702";

  version = "20231109";

  src = fetchgit {

    url = "https://git.savannah.gnu.org/r/gnulib.git";

    rev = "901694b904cd861adc2529b2e05a3fb33f9b534f";

    sha256 = "1f5znlv2wjziglw9vlygdgm4jfbsz34h2dz6w4h90bl4hm0ycb1w";

  src = fetchFromSavannah {

    repo = "gnulib";

    rev = "2dd1a7984c6b3e6056cef7e3f9933e0039c21634";

    hash = "sha256-QtWf3mljEnr0TTogkoKN63Y5HTm14A2e/sIXX3xe2SE=";

  };

  postPatch = ''

  meta = with lib; {

    description = "Central location for code to be shared among GNU packages";

    homepage = "https://www.gnu.org/software/gnulib/";

    changelog = "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=ChangeLog";

    license = licenses.gpl3Plus;

    mainProgram = "gnulib-tool";

    platforms = platforms.unix;

    sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq";

  };

  patches = [

    ./fix-config_h-includes-should-be-first.patch

  ];

  postPatch = ''

    substituteInPlace configure.ac \

      --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])"

  meta = {

    inherit version;

    description = "A command-line tool to print idle time from libXss";

    homepage = "http://taktoa.me/xprintidle-ng/";

    license = lib.licenses.gpl2;

    homepage = "https://github.com/taktoa/xprintidle-ng";

    license = lib.licenses.gpl2Only;

    maintainers = [ lib.maintainers.raskin ];

    platforms = lib.platforms.linux;

  };

Fixes the config.h include error during build:

```console

In file included from src/xprintidle-ng.c:36:

lib/time.h:28:3: error: #error "Please include config.h first."

    28 |  #error "Please include config.h first."

      |   ^~~~~

```

Introduced since gnulib upgrade:

* https://github.com/coreutils/gnulib/commit/8ad7bc6

* https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00088.html

* https://www.gnu.org/software/gnulib/manual/html_node/Source-changes.html

The last version of gnulib now checks that config.h is the first include

in every compilation unit.

This is not the case with the xprintidle-ng source code, so this patch

moves these `config.h` inclusions to be first.

---

 src/time-format.c   | 2 +-

 src/xprintidle-ng.c | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/time-format.c b/src/time-format.c

index 3a46749..4c0a4d2 100644

--- a/src/time-format.c

+++ b/src/time-format.c

@@ -18,10 +18,10 @@

 //     51 Franklin Street, Fifth Floor

 //     Boston, MA 02110-1301, USA.

+#include <config.h>

 #include <stdbool.h>

 #include <signal.h>

 #include <time.h>

-#include <config.h>

 #include "system.h"

 #include "xalloc.h"

diff --git a/src/xprintidle-ng.c b/src/xprintidle-ng.c

index 5156adf..ca69b2d 100644

--- a/src/xprintidle-ng.c

+++ b/src/xprintidle-ng.c

@@ -28,13 +28,13 @@

 // Eivind Magnus Hvidevold <hvidevold@gmail.com>.

 // kpowersave is licensed under the GNU GPL, version 2 _only_.

+#include <config.h>

 #include <X11/Xlib.h>

 #include <X11/extensions/dpms.h>

 #include <X11/extensions/scrnsaver.h>

 #include <stdbool.h>

 #include <signal.h>

 #include <time.h>

-#include <config.h>

 #include "system.h"

 #include "errno.h"

 #include "error.h"

--

2.42.0

{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync}:

{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, darwin }:

stdenv.mkDerivation rec {

  pname = "idutils";

    ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git

    '';

  buildInputs = lib.optional stdenv.isLinux emacs;

  buildInputs = lib.optionals stdenv.isLinux [

    emacs

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.CoreServices

  ];

  nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync ];

  doCheck = !stdenv.isDarwin;

  # libraries

, brotli

, bzip2

, darwin

, gpgme

, libhsts

, libidn2

    xz

    zlib

    zstd

  ] ++ lib.optional sslSupport openssl;

  ] ++ lib.optionals sslSupport [

    openssl

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.CoreServices

  ];

  # TODO: include translation files

  autoreconfPhase = ''