diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-09-05 15:02:25 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-09-05 15:02:25 +0200 |
| commit | 7f732aca66089969ca0733bd129cc1c12b44fe25 (patch) | |
| tree | cf5464b1c247091a636e70f6eac3963f88df4113 /pkgs/development/tools/misc | |
| parent | b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6 (diff) | |
| download | nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.tar nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.tar.gz nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.tar.bz2 nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.tar.lz nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.tar.xz nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.tar.zst nixpkgs-7f732aca66089969ca0733bd129cc1c12b44fe25.zip | |
Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"
This reverts commit b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6, reversing changes made to 5b6c2380adb4c4ddb0f87152cef0016333ea5a4d.
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/gnum4/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/gnum4/s_isdir.patch | 14 |
2 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 50e05e4829a..d0b5911b71d 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -7,18 +7,27 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.19"; + version = "1.4.18"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; + sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; }; doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; - patches = lib.optional stdenv.isDarwin ./darwin-secure-format.patch; + # Upstream is aware of it; it may be in the next release. + patches = + [ + ./s_isdir.patch + (fetchurl { + url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; + sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; + }) + ] + ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = "https://www.gnu.org/software/m4/"; diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/pkgs/development/tools/misc/gnum4/s_isdir.patch new file mode 100644 index 00000000000..a009a4ba446 --- /dev/null +++ b/pkgs/development/tools/misc/gnum4/s_isdir.patch @@ -0,0 +1,14 @@ +Fails to build with glibc 2.12.1 without this patch. + +http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html + +--- a/src/path.c ++++ b/src/path.c +@@ -22,6 +22,7 @@ + /* Handling of path search of included files via the builtins "include" + and "sinclude". */ + + #include "m4.h" ++#include "sys/stat.h" + + struct includes |