JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixpkgs: add 'graphviz' to tamarin-prover dependencies

Browse Source 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2017-12-30 18:35:46 -06:00
parent f772b8d298
commit a31bdc0739
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/science/logic/tamarin-prover/default.nix
View File

@ -1,5 +1,6 @@
{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib { haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib
, makeWrapper, maude # the following are non-haskell dependencies
, makeWrapper, which, maude, graphviz
}: }:
let let
@ -67,7 +68,7 @@ mkDerivation (common "tamarin-prover" src // {
# wrap the prover to be sure it can find maude # wrap the prover to be sure it can find maude
postInstall = '' postInstall = ''
wrapProgram $out/bin/tamarin-prover \ wrapProgram $out/bin/tamarin-prover \
--prefix PATH : ${lib.makeBinPath [ maude ]} --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]}
''; '';
executableToolDepends = [ makeWrapper ]; executableToolDepends = [ makeWrapper ];

8
pkgs/top-level/all-packages.nix
View File

@ -5967,8 +5967,12 @@ with pkgs;
psc-package = haskell.lib.justStaticExecutables psc-package = haskell.lib.justStaticExecutables
(haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); (haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
tamarin-prover = # haskell.lib.justStaticExecutables tamarin-prover =
(haskellPackages.callPackage ../applications/science/logic/tamarin-prover { inherit maude; }); (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; inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4;
haxe = haxe_3_4; haxe = haxe_3_4;