public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libvirt: add numa support

This commit is contained in:
Domen Kožar 2015-12-15 19:55:39 +01:00
parent caa9c53d6e
commit 0acc32e836
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libvirt/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
, dnsmasq, libnl, libpcap, libxslt, xhtml1 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl
, pythonPackages, perlPackages , pythonPackages, perlPackages
}: }:
@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath numad numactl
]; ];
preConfigure = '' preConfigure = ''
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
substituteInPlace configure --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
patchShebangs . # fixes /usr/bin/python references patchShebangs . # fixes /usr/bin/python references
''; '';
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
"--with-macvtap" "--with-macvtap"
"--with-virtualport" "--with-virtualport"
"--with-libpcap" "--with-libpcap"
"--with-numad"
]; ];
installFlags = [ installFlags = [
@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/libexec/libvirt-guests.sh \ substituteInPlace $out/libexec/libvirt-guests.sh \
--replace "$out/bin" "${gettext}/bin" --replace "$out/bin" "${gettext}/bin"
wrapProgram $out/sbin/libvirtd \ wrapProgram $out/sbin/libvirtd \
--prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;