diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
| commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
| tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/applications/virtualization | |
| parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
| parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
| download | nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/virtualization')
5 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index cfa58c717682..3d69de9c15ba 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index f9fb6311fc3a..dcac628e3676 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp docker-gc $out/bin chmod +x $out/bin/docker-gc wrapProgram $out/bin/docker-gc \ - --prefix PATH : "${docker}/bin:${coreutils}/bin:${procps}/bin:${gnused}/bin:${findutils}/bin:${gnugrep}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" ''; meta = { diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index f5e0441ea6c9..dd8ddfd0e0b9 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -36,9 +36,7 @@ in stdenv.mkDerivation rec { postInstall = '' sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network" wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${iproute}/bin" \ - --prefix PATH ':' "${dbus}/bin" \ - --prefix PATH ':' "${systemd}/bin" + --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1d37e45b23dc..6208ad624ecd 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation { for i in lib/VBoxOGL*.so do - patchelf --set-rpath $out/lib:${dbus.lib}/lib:${libXcomposite.out}/lib:${libXdamage.out}/lib:${libXext.out}/lib:${libXfixes.out}/lib $i + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i done # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index a62a1a200923..a036cd8d5649 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -143,6 +143,9 @@ stdenv.mkDerivation { touch tools/include/gnu/stubs-32.h ''; + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # TODO: Flask needs more testing before enabling it by default. #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; |