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/applications/science/logic | |
| 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/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/z3/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 88aafcdae222..dd71cf2cb1a8 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; - buildInputs = [ python fixDarwinDylibNames ] + nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ python ] ++ optional javaBindings jdk ++ optionals ocamlBindings [ ocaml findlib zarith ] ; |