diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-22 00:00:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-22 00:00:06 +0200 |
commit | ab6186be58db8dbf783a53928359f6f3846b5090 (patch) | |
tree | 082fba9c0d28e1df1778c8ed8679340fbc5065e8 /pkgs/development/libraries | |
parent | 27f66004194ca05f172c905b4f2d1c7aacf8cb06 (diff) | |
parent | ebac61b0d086d75cbf450d091c21ae1040081cbd (diff) | |
download | nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.tar nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.tar.gz nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.tar.bz2 nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.tar.lz nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.tar.xz nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.tar.zst nixlib-ab6186be58db8dbf783a53928359f6f3846b5090.zip |
Merge pull request #45440 from xeji/libvirt-revert
Revert "libvirt: 4.5.0 -> 4.6.0" and attempted fixes
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4b104a04c15d..fd35864fe343 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi }: @@ -16,26 +16,26 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.6.0"; + version = "4.5.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0rj0azi766g0xdxydvkq9nj95hhsiwqgclzzmyxvk2axhb8nrb5l"; + sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "1lv1s93k056wylrlc7j4q45zir9z4qshzcl454spy2wb8cdn3h4s"; + sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; fetchSubmodules = true; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson + libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ @@ -60,9 +60,7 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - substituteInPlace src/util/virjsoncompat.c --replace \ - '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"' - ''; + ''; configureFlags = [ "--localstatedir=/var" |