summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-12-31 17:37:49 +0000
committerGitHub <noreply@github.com>2021-12-31 17:37:49 +0000
commitf8d88f296192eeb53da6c003a3a511905bbe751e (patch)
treead15c579efc5eb37dc729effd4d4078f4d242d3a
parentMerge pull request #152825 from NixOS/backport-147984-to-release-21.11 (diff)
parentpython3Packages.libnacl: fix build on 32-bit platforms (diff)
downloadnixpkgs-f8d88f296192eeb53da6c003a3a511905bbe751e.tar.gz
Merge pull request #152959 from NixOS/backport-152749-to-release-21.11
[Backport release-21.11] python3Packages.libnacl: fix build on 32-bit platforms
-rw-r--r--pkgs/development/python-modules/libnacl/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index f8cb85ab4182..7ced26888b80 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, libsodium
, pytestCheckHook
}:
@@ -17,6 +18,15 @@ buildPythonPackage rec {
sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc=";
};
+ patches = [
+ # Fixes build on 32-bit platforms
+ (fetchpatch {
+ name = "fix-crypto_kdf_derive_from_key-32bit.patch";
+ url = "https://github.com/saltstack/libnacl/commit/e8a1f95ee1d4d0806fb6aee793dcf308b05d485d.patch";
+ sha256 = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU=";
+ })
+ ];
+
buildInputs = [ libsodium ];
postPatch =