diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 03:23:58 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 17:41:16 +0100 |
commit | a31d98f3120e0f676303b7fc3e84424e6b325290 (patch) | |
tree | 50eed3f28ebcae3fc1d7e6676d7446e8b55e2f53 /pkgs/applications/virtualization | |
parent | 20c5476a8bf09330e438f6d083bd4e197fefd17e (diff) | |
download | nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.gz nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.bz2 nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.lz nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.xz nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.zst nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.zip |
tree-wide: autorename gnome packages to use dashes
Diffstat (limited to 'pkgs/applications/virtualization')
8 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e9cee2503851..bd014dd60d37 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig +, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , libX11, freefont_ttf }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig + SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig libX11 freefont_ttf ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 694026d3bac2..00303be12da2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -9,7 +9,7 @@ , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , hostCpuOnly ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ]; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 74da6c4ab167..15ae244b3291 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, +{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice_protocol glib + buildInputs = [ alsaLib spice-protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9e18a6738c38..f913ab688cf8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, python2Packages, intltool, file , wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3 -, spiceSupport ? true, spice_gtk ? null +, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, spiceSupport ? true, spice-gtk ? null }: with stdenv.lib; @@ -24,8 +24,8 @@ python2Packages.buildPythonApplication rec { buildInputs = [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo gtk3 - ] ++ optional spiceSupport spice_gtk; + gsettings-desktop-schemas libosinfo gtk3 + ] ++ optional spiceSupport spice-gtk; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index e723cd02bd05..9316496a547e 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg, qttools -, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { @@ -21,7 +21,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtsvg - libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol + libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2f5a6192c86c..eb48e1d3d300 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen -, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen +, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl , libapparmor , spiceSupport ? true -, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null +, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> - spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; with stdenv.lib; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info - libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen ] ++ optionals spiceSupport [ - spice_gtk spice_protocol libcap gdbm + spice-gtk spice-protocol libcap gdbm ]; postInstall = '' diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 22799a7af8e7..48f74ce72e5e 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -9,7 +9,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -29,7 +29,7 @@ let }); qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index b1fcf36a46c1..be6c4e3fcc7a 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -8,7 +8,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -30,7 +30,7 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; in |