diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 026aeb220e56..dc6cef0bbba1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: +{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: stdenv.mkDerivation rec { pname = "ocaml-libvirt"; - rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; - version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 + version = "0.6.1.5"; - src = fetchgit { - url = "git://git.annexia.org/git/ocaml-libvirt.git"; - rev = rev; - sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw"; + src = fetchFromGitLab { + owner = "libvirt"; + repo = "libvirt-ocaml"; + rev = "v${version}"; + sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k"; }; propagatedBuildInputs = [ libvirt ]; - nativeBuildInputs = [ autoconf findlib ]; + nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ]; buildInputs = [ ocaml ]; createFindlibDestdir = true; - preConfigure = '' - autoconf - ''; - buildPhase = "make all opt CPPFLAGS=-Wno-error"; installPhase = "make install-opt"; |