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/tiledb | |
| parent | 309ce3f8a1127a5dff1dcc2512777122d49529d4 (diff) | |
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/tiledb')
| -rw-r--r-- | pkgs/development/libraries/tiledb/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 2726ed7f237b..89318dd4e75b 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cmake python doxygen - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; checkInputs = [ gtest @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { openssl boost libpqxx - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; # emulate the process of pulling catch down postPatch = '' |