Merge pull request #23073 from volth/libguestfs-1.34
libguestfs: 1.29.5 -> 1.36.3
This commit is contained in:
@@ -1,20 +1,28 @@
|
||||
{ stdenv, fetchurl, libvirt, ocaml, findlib }:
|
||||
{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-libvirt-${version}";
|
||||
version = "0.6.1.4";
|
||||
rev = "3169af3";
|
||||
version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz";
|
||||
sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd";
|
||||
src = fetchgit {
|
||||
url = "git://git.annexia.org/git/ocaml-libvirt.git";
|
||||
rev = rev;
|
||||
sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libvirt ];
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
nativeBuildInputs = [ autoconf findlib ];
|
||||
|
||||
buildInputs = [ ocaml ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
preConfigure = ''
|
||||
autoconf
|
||||
'';
|
||||
|
||||
buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt";
|
||||
|
||||
installPhase = "make install-opt";
|
||||
|
||||
Reference in New Issue
Block a user