nixpkgs: add 'graphviz' to tamarin-prover dependencies

Signed-off-by: Austin Seipp <aseipp@pobox.com>

+9 -4
+3 -2
pkgs/applications/science/logic/tamarin-prover/default.nix
··· 1 1 { haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib 2 - , makeWrapper, maude 2 + # the following are non-haskell dependencies 3 + , makeWrapper, which, maude, graphviz 3 4 }: 4 5 5 6 let ··· 67 68 # wrap the prover to be sure it can find maude 68 69 postInstall = '' 69 70 wrapProgram $out/bin/tamarin-prover \ 70 - --prefix PATH : ${lib.makeBinPath [ maude ]} 71 + --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} 71 72 ''; 72 73 73 74 executableToolDepends = [ makeWrapper ];
+6 -2
pkgs/top-level/all-packages.nix
··· 5967 5967 psc-package = haskell.lib.justStaticExecutables 5968 5968 (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); 5969 5969 5970 - tamarin-prover = # haskell.lib.justStaticExecutables 5971 - (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { inherit maude; }); 5970 + tamarin-prover = 5971 + (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { 5972 + # do not use the haskell packages 'graphviz' and 'maude' 5973 + inherit maude which; 5974 + graphviz = graphviz-nox; 5975 + }); 5972 5976 5973 5977 inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4; 5974 5978 haxe = haxe_3_4;