diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-10-10 17:32:46 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-10-11 05:59:21 +0000 |
| commit | 6113d95235e67ca49e2a58688c789ee76dca4e2e (patch) | |
| tree | 2c1319a1e30f6c10e542f5d84fcb8b7fe3e6dc62 | |
| parent | 726b4da18941439cdeb1a348b351cf56a2a879ac (diff) | |
| download | nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.tar nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.tar.gz nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.tar.bz2 nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.tar.lz nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.tar.xz nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.tar.zst nixlib-6113d95235e67ca49e2a58688c789ee76dca4e2e.zip | |
prooftree: cleaning
| -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 { }; |