diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-11 08:22:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 08:22:27 +0100 |
| commit | 01cca5981c902c323e4797a5616efc881a64cf77 (patch) | |
| tree | 2735ea176be1033b3127a0b2fd0c7418bf28452e /pkgs | |
| parent | a1f57f0feb055c85f49090e4d20740f779d783a3 (diff) | |
| parent | 6113d95235e67ca49e2a58688c789ee76dca4e2e (diff) | |
| download | nixlib-01cca5981c902c323e4797a5616efc881a64cf77.tar nixlib-01cca5981c902c323e4797a5616efc881a64cf77.tar.gz nixlib-01cca5981c902c323e4797a5616efc881a64cf77.tar.bz2 nixlib-01cca5981c902c323e4797a5616efc881a64cf77.tar.lz nixlib-01cca5981c902c323e4797a5616efc881a64cf77.tar.xz nixlib-01cca5981c902c323e4797a5616efc881a64cf77.tar.zst nixlib-01cca5981c902c323e4797a5616efc881a64cf77.zip | |
Merge pull request #48168 from vbgl/prooftree-0.13
prooftree: cleaning
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/logic/prooftree/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index a88a84e3b0d1..1f6620a2872d 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: +{ stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "prooftree-${version}"; version = "0.13"; @@ -10,7 +10,8 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ + ocaml findlib camlp5 lablgtk ]); dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; @@ -39,4 +40,4 @@ stdenv.mkDerivation (rec { maintainers = [ maintainers.jwiegley ]; license = licenses.gpl3; }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 866adafff53f..5a5ae8c1ba10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21278,7 +21278,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { }; + prooftree = callPackage ../applications/science/logic/prooftree {}; prover9 = callPackage ../applications/science/logic/prover9 { }; |