about summary refs log tree commit diff
path: root/pkgs/development/libraries/libsodium
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2023-11-25 12:38:35 +0000
committerSergei Trofimovich <slyich@gmail.com>2023-11-25 12:38:35 +0000
commitca68d6a2a7ec86574379c7ae9825021c51ca5d41 (patch)
tree1bff988144f0d85050b7afd9d5255e50e4ab00a6 /pkgs/development/libraries/libsodium
parent7b1e146a49051ef404a82c69ec3b7d7f9d36ede9 (diff)
libsodium: 1.0.18 -> 1.0.19, drop -Ofast flag
Changes: https://github.com/jedisct1/libsodium/releases/tag/1.0.19-RELEASE
Diffstat (limited to 'pkgs/development/libraries/libsodium')
-rw-r--r--pkgs/development/libraries/libsodium/default.nix20
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index b3a00d89a5d53..5ecd27f600781 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,21 +1,29 @@
-{ lib, stdenv, fetchurl, autoreconfHook
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook
 , testers
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsodium";
-  version = "1.0.18";
+  version = "1.0.19";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
+    hash = "sha256-AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o=";
   };
 
   outputs = [ "out" "dev" ];
 
-  patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch;
-
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook;
+  patches = [
+    # Drop -Ofast as it breaks floating point arithmetics in downstream
+    # users.
+    (fetchpatch {
+      name = "drop-Ofast.patch";
+      url  = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch";
+      hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY=";
+    })
+  ] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch;
+
+  nativeBuildInputs = [ autoreconfHook ];
 
   separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";