diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-17 18:56:22 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-20 14:03:08 -0500 |
| commit | 7cfdb8950d93888811fbd2da3a575521d8781ace (patch) | |
| tree | 8454e6260b4ff558ea04f8e175fe0372b7868201 /pkgs/development/libraries/libgcrypt/default.nix | |
| parent | 5039d6ed1f5354289d9b59f798201108db277113 (diff) | |
| download | nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.tar nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.tar.gz nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.tar.bz2 nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.tar.lz nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.tar.xz nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.tar.zst nixpkgs-7cfdb8950d93888811fbd2da3a575521d8781ace.zip | |
libgcrypt: keep new lock behavior but only do so around collector access
Not around a function that itself will grab the rng lock. Unfortunate that we obtain/release the lock twice but this seems least invasive way to fix this.
Diffstat (limited to 'pkgs/development/libraries/libgcrypt/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index de657bc9c34..1a9e19ede23 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + patches = [ ./fix-jent-locking.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpgerror ] |