diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-08 01:11:21 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-08 01:11:21 +0100 |
| commit | 7e16bc1a69448c5a47b8d58fa9625abda45e3d15 (patch) | |
| tree | 2aad66866f39133678d8b8ba11746881ad7df4ec /pkgs/development/libraries/libsodium | |
| parent | cdbeb9666cf2842608826f3e72199948a83b3b8c (diff) | |
libsodium: drop mingw patch
Diffstat (limited to 'pkgs/development/libraries/libsodium')
| -rw-r--r-- | pkgs/development/libraries/libsodium/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libsodium/mingw-no-fortify.patch | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 5ecd27f600781..4570b10db39c7 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; }) - ] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; + ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libsodium/mingw-no-fortify.patch b/pkgs/development/libraries/libsodium/mingw-no-fortify.patch deleted file mode 100644 index e13a801f8db70..0000000000000 --- a/pkgs/development/libraries/libsodium/mingw-no-fortify.patch +++ /dev/null @@ -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"]) - |