diff options
| author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2017-04-19 02:01:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 02:01:54 +0200 |
| commit | e0b0a07a74cabb2aa1b463787c605a47f44bf3de (patch) | |
| tree | 2b64260ee2b396b2b01899c61880f1f752a03aab /pkgs/development/ocaml-modules | |
| parent | 1dcb587d93e8a3f1de4c47939e4dd1e91c8546bc (diff) | |
| parent | dc0e338e01a75a8c7f79961d76eb10d8e023806b (diff) | |
| download | nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.tar nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.tar.gz nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.tar.bz2 nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.tar.lz nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.tar.xz nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.tar.zst nixlib-e0b0a07a74cabb2aa1b463787c605a47f44bf3de.zip | |
Merge pull request #23073 from volth/libguestfs-1.34
libguestfs: 1.29.5 -> 1.36.3
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -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..0ad5d09d687c 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"; + 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"; |