pyrox.dev
lol
libsodium: Don't fortify on mingw
+21
-1
+6
-1
pkgs/development/libraries/libsodium/default.nix
+6
-1
pkgs/development/libraries/libsodium/default.nix
···
1
-
{ lib, stdenv, fetchurl }:
1
+
{ lib, stdenv, fetchurl, autoreconfHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "libsodium";
···
10
10
};
11
11
12
12
outputs = [ "out" "dev" ];
13
+
14
+
patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch;
15
+
16
+
nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook;
17
+
13
18
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
14
19
15
20
enableParallelBuilding = true;
+15
pkgs/development/libraries/libsodium/mingw-no-fortify.patch
+15
pkgs/development/libraries/libsodium/mingw-no-fortify.patch
···
1
+
diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac
2
+
--- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400
3
+
+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400
4
+
@@ -217,11 +217,6 @@
5
+
6
+
AC_CHECK_DEFINE([__wasi__], [WASI="yes"], [])
7
+
8
+
-AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
9
+
- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
10
+
- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
11
+
-])
12
+
-
13
+
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
14
+
[CFLAGS="$CFLAGS -fvisibility=hidden"])
15
+