Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions pkgs/by-name/gn/gnum4/loong-fix-build.patch

This file was deleted.

16 changes: 9 additions & 7 deletions pkgs/by-name/gn/gnum4/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnum4";
version = "1.4.19";
version = "1.4.20";

src = fetchurl {
url = "mirror://gnu/m4/m4-${version}.tar.bz2";
sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg=";
url = "mirror://gnu/m4/m4-${finalAttrs.version}.tar.bz2";
hash = "sha256-rGmJ7l0q7YFzl4BjDMLOCX4qZUb+uWpKVNs31GoUUuQ=";
};

# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild
patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch;
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
# necessary for FreeBSD code path in configure
postPatch =
Expand All @@ -35,6 +33,10 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

# Without the change the build fails on Darwin as https://hydra.nixos.org/build/300264726/nixlog/3/tail:
# clean-temp.c:235:14: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "format" ];

doCheck = false;

configureFlags = [
Expand Down Expand Up @@ -66,4 +68,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix ++ lib.platforms.windows;
};

}
})
Loading