Merge pull request #48168 from vbgl/prooftree-0.13

prooftree: cleaning
This commit is contained in:
Jörg Thalheim 2018-10-11 08:22:27 +01:00 committed by GitHub
commit 01cca5981c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View file

@ -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;
};
})
}

View file

@ -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 { };