nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 02:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnum4: 1.4.18 -> 1.4.19 (#136037)

Browse Source 
Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc>
This commit is contained in:
Dmitry Bogatov 2021-08-29 20:06:51 -04:00 committed by GitHub
parent 57ced08965
commit 4fdee57420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/misc/gnum4/default.nix
View File

@ -7,27 +7,18 @@
stdenv.mkDerivation rec {
pname = "gnum4";
version = "1.4.18";
version = "1.4.19";
src = fetchurl {
url = "mirror://gnu/m4/m4-${version}.tar.bz2";
sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36";
sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg=";
};
doCheck = false;
configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ];
# 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;
patches = lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
meta = {
homepage = "https://www.gnu.org/software/m4/";

14
pkgs/development/tools/misc/gnum4/s_isdir.patch
View File

@ -1,14 +0,0 @@
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