diff options
| author | Volth <volth@webmaster.ms> | 2017-02-22 06:01:09 +0000 |
|---|---|---|
| committer | Volth <volth@webmaster.ms> | 2017-04-13 15:54:11 +0000 |
| commit | cf68f546b1d5648c1d83f33e265c019c9f971c10 (patch) | |
| tree | 985963e9ffa3d25a90224a4321b766f2d99856a7 /pkgs/development/ocaml-modules/ocaml-libvirt | |
| parent | f21a6940da9a70b25506069943eccdc0855750f3 (diff) | |
| download | nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.tar nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.tar.gz nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.tar.bz2 nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.tar.lz nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.tar.xz nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.tar.zst nixlib-cf68f546b1d5648c1d83f33e265c019c9f971c10.zip | |
libguestfs: 1.29.5 -> 1.34.4
Diffstat (limited to 'pkgs/development/ocaml-modules/ocaml-libvirt')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 439beaa24ffc..01b761e4e4ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -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"; + version = "0.6.1.5"; # FIXME: libguestfs depends on not yet released 0.6.1.5, so the latest post-0.6.1.4 master from git is used - 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 = "8853f5a49587f00a7d2a5c8c7e52480a16bbdb02"; + sha256 = "1lnsvyb6dll58blacc629nz1lzc20p7ayqn9pag1rrx5i54q9v24"; }; propagatedBuildInputs = [ libvirt ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ autoconf findlib ]; + + buildInputs = [ ocaml ]; createFindlibDestdir = true; + preConfigure = '' + substituteInPlace configure.ac --replace 0.6.1.4 0.6.1.5 + autoconf + ''; + buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; installPhase = "make install-opt"; |