summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-09-11 01:15:58 +0200
committerGitHub <noreply@github.com>2016-09-11 01:15:58 +0200
commit3d479813f5919b6f87fac714d547cf1d1541bb8a (patch)
tree526a332dd7c67b28cd5aeb2b6a2059f160dad77c /pkgs
parent628c86c51a1321e68ec724d3feeb12aac34d3e32 (diff)
parent54ff1184779419c91cb57d7a3a234a069fcdc592 (diff)
downloadnixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.tar
nixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.tar.gz
nixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.tar.bz2
nixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.tar.lz
nixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.tar.xz
nixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.tar.zst
nixlib-3d479813f5919b6f87fac714d547cf1d1541bb8a.zip
Merge pull request #18497 from aneeshusa/add-z3-dependency-for-cryptol
cryptol: Make Z3 available for REPL users
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33b1523df087..9262c8c144a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4443,7 +4443,15 @@ in
     coq = coq_8_5;
   });
 
-  cryptol = haskellPackages.cryptol;
+  # Users installing via `nix-env` will likely be using the REPL,
+  # which has a hard dependency on Z3, so make sure it is available.
+  cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: {
+    buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ];
+    installPhase = (oldAttrs.installPhase or "") + ''
+      wrapProgram $out/bin/cryptol \
+        --prefix 'PATH' ':' "${lib.getBin z3}/bin"
+    '';
+  });
 
   devpi-client = callPackage ../development/tools/devpi-client {};