From a31bdc07395d5ccdeeea3961fa24c235e06aed1a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 30 Dec 2017 18:35:46 -0600 Subject: [PATCH] nixpkgs: add 'graphviz' to tamarin-prover dependencies Signed-off-by: Austin Seipp --- .../applications/science/logic/tamarin-prover/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index f03751bacf2b..1c3e3ccc7693 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,5 +1,6 @@ { haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib -, makeWrapper, maude +# the following are non-haskell dependencies +, makeWrapper, which, maude, graphviz }: let @@ -67,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 [ maude ]} + --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} ''; executableToolDepends = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1445d099f8ee..5c47f2b7c991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5967,8 +5967,12 @@ with pkgs; psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); - tamarin-prover = # haskell.lib.justStaticExecutables - (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { inherit maude; }); + tamarin-prover = + (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { + # do not use the haskell packages 'graphviz' and 'maude' + inherit maude which; + graphviz = graphviz-nox; + }); inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4; haxe = haxe_3_4;