cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libsodium: drop mingw patch

Browse source
This commit is contained in:
Weijia Wang 2024-01-08 01:11:21 +01:00
parent cdbeb9666c
commit 7e16bc1a69
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/libsodium/default.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch";
hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY=";
}) })
] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

15
pkgs/development/libraries/libsodium/mingw-no-fortify.patch
View file

@ -1,15 +0,0 @@
diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac
--- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400
+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400
@@ -217,11 +217,6 @@
AC_CHECK_DEFINE([__wasi__], [WASI="yes"], [])
-AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
-])
-
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
[CFLAGS="$CFLAGS -fvisibility=hidden"])