diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 16:49:30 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 16:49:37 +0100 |
| commit | 9e4d59211407078986de97774a80063e678e8f89 (patch) | |
| tree | d891bd8d431ef1b960bf5a293ab7c3fdecaf7153 /pkgs/applications/science | |
| parent | e196e68bee289193e4e133dd378addd8572dc4c5 (diff) | |
| parent | f17f17af85d64602202b78e731136f13b9a0cbad (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/eve/default.nix
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/tamarin-prover/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index b34fd3ef8ba89..50824ab3c0c2f 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,4 +1,4 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, lib +{ haskellPackages, mkDerivation, fetchFromGitHub, lib, stdenv # the following are non-haskell dependencies , makeWrapper, which, maude, graphviz, glibcLocales }: @@ -76,7 +76,9 @@ mkDerivation (common "tamarin-prover" src // { executableToolDepends = [ makeWrapper which maude graphviz ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ + '' + lib.optionalString stdenv.isLinux '' --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ + '' + '' --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} # so that the package can be used as a vim plugin to install syntax coloration install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim |