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

spice-gtk: 0.29 -> 0.32

Browse Source
This commit is contained in:
Graham Christensen 2016-09-24 07:44:59 -04:00
parent 0d20194889
commit 6d1638e697
No known key found for this signature in database
GPG Key ID: FE918C3A98C1030F
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.20/default.nix
View File

@ -271,7 +271,7 @@ let
gnome-boxes = callPackage ./apps/gnome-boxes {
gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
spice_gtk = pkgs.spice_gtk;
};
gnome-calendar = callPackage ./apps/gnome-calendar { };
@ -390,7 +390,7 @@ let
gpaste = callPackage ./misc/gpaste { };
pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
gtkhtml = callPackage ./misc/gtkhtml { };
pomodoro = callPackage ./misc/pomodoro { };

18
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gtk2, spice_protocol, intltool, celt_0_5_1
{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1
, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
, cyrus_sasl, pythonPackages, autoreconfHook, usbredir, libsoup
, gtk3, enableGTK3 ? false }:
, gtk3, epoxy }:
with stdenv.lib;
let
inherit (pythonPackages) python pygtk;
in stdenv.mkDerivation rec {
name = "spice-gtk-0.29";
name = "spice-gtk-0.32";
src = fetchurl {
url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
sha256 = "0wz9sm44gnmwjpmyacwd5jyzvhfl1wlf1dn3qda20si42cky5is4";
sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c";
};
buildInputs = [
spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
] ++ (if enableGTK3 then [ gtk3 ] else [ gtk2 ]);
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
];
nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--disable-maintainer-mode"
(if enableGTK3 then "--with-gtk3" else "--with-gtk=2.0")
"--with-gtk3"
];
dontDisableStatic = true; # Needed by the coroutine test
@ -43,9 +43,9 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
description = "A GTK+2 and GTK+3 SPICE widget";
description = "A GTK+3 SPICE widget";
longDescription = ''
spice-gtk is a GTK+2 and GTK+3 SPICE widget. It features glib-based
spice-gtk is a GTK+3 SPICE widget. It features glib-based
objects for SPICE protocol parsing and a gtk widget for embedding
the SPICE display into other applications such as virt-manager.
Python bindings are available too.

4
pkgs/top-level/all-packages.nix
View File

@ -15328,7 +15328,7 @@ in
virt-viewer = callPackage ../applications/virtualization/virt-viewer {
gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk.override { enableGTK3 = true; };
spice_gtk = spice_gtk;
};
virtmanager = callPackage ../applications/virtualization/virt-manager {
@ -15336,7 +15336,7 @@ in
vte = gnome3.vte;
dconf = gnome3.dconf;
gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk.override { enableGTK3 = true; };
spice_gtk = spice_gtk;
system-libvirt = libvirt;
};