From bae2e7ceb36313227c61a3e0fd18fe998dd2292a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 30 Dec 2017 19:00:28 -0600 Subject: [PATCH] nixpkgs: add sapic as a dependency to tamarin-prover Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/tamarin-prover/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 1c3e3ccc769..b03685484aa 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,6 +1,6 @@ { haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib # the following are non-haskell dependencies -, makeWrapper, which, maude, graphviz +, makeWrapper, which, maude, graphviz, sapic }: let @@ -68,7 +68,7 @@ mkDerivation (common "tamarin-prover" src // { # wrap the prover to be sure it can find maude postInstall = '' wrapProgram $out/bin/tamarin-prover \ - --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} + --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} ''; executableToolDepends = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72d26445b0d..26ad6c3c7e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5969,8 +5969,8 @@ with pkgs; tamarin-prover = (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { - # do not use the haskell packages 'graphviz' and 'maude' - inherit maude which; + # NOTE: do not use the haskell packages 'graphviz' and 'maude' + inherit maude which sapic; graphviz = graphviz-nox; });