b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #166292 from lsix/libgcrypt-1.10.1

Browse source
This commit is contained in:
Sandro 2022-04-11 12:21:00 +02:00 committed by GitHub
parent 6ae99b5677 494275558a
commit e1b950fedb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libgcrypt/default.nix
View file

@ -15,11 +15,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "libgcrypt";
version = "1.9.4";
version = "1.10.1";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a";
hash = "sha256-7xSuVGsAhM2EJZ9hpV4Ho4w7U6/A9Ua//O8vAbr/6d4=";
};
outputs = [ "out" "dev" "info" ];

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

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
};
patches = [ ./fix-regtest-client.patch ];
outputs = [ "bin" "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ];

11
pkgs/development/libraries/libotr/fix-regtest-client.patch Normal file
View file

@ -0,0 +1,11 @@
diff -Nur a/tests/regression/client/client.c b/tests/regression/client/client.c
--- a/tests/regression/client/client.c 2015-12-25 17:39:45.000000000 +0000
+++ b/tests/regression/client/client.c 2022-03-29 19:33:18.646398117 +0100
@@ -27,6 +27,7 @@
#include <syscall.h>
#include <sys/epoll.h>
#include <sys/types.h>
+#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>