diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-26 08:17:14 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-26 08:19:17 +0100 |
commit | 336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 (patch) | |
tree | 8812d7fef1d0ed89d4507279511f35e2c050097c /pkgs/development/libraries/libevent | |
parent | 309ce3f8a1127a5dff1dcc2512777122d49529d4 (diff) | |
download | nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.gz nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.bz2 nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.lz nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.xz nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.zst nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.zip |
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
Diffstat (limited to 'pkgs/development/libraries/libevent')
-rw-r--r-- | pkgs/development/libraries/libevent/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e23c7d55c5e..cbde3206717 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional sslSupport "openssl" ; + nativeBuildInputs = [] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ; + buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; doCheck = false; # needs the net |