b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libcanberra: init without gtk

Browse source
This commit is contained in:
Jan Tojnar 2017-12-17 02:49:13 +01:00
parent 2c87db3cf2
commit 224853d4dc
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
, glib, gtk, pango, atk, libXau, libcanberra
, glib, gtk, pango, atk, libXau, libcanberra_gtk2
, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }:
@ -15,7 +15,7 @@ stdenv.mkDerivation {
[ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool
ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf
gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils
libtasn1 libtool libcanberra xorg.libICE xorg.libSM
libtasn1 libtool libcanberra_gtk2 xorg.libICE xorg.libSM
];
nativeBuildInputs = [ pkgconfig intltool which ];

4
pkgs/desktops/gnome-2/desktop/metacity/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage
, libcanberra, intltool, GConf, startup_notification, zenity, gnome_doc_utils
, libcanberra_gtk2, intltool, GConf, startup_notification, zenity, gnome_doc_utils
, gsettings_desktop_schemas }:
stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra
[ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra_gtk2
intltool GConf startup_notification zenity gnome_doc_utils
gsettings_desktop_schemas
];

4
pkgs/desktops/gnome-2/platform/libgnome/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra
{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2
, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
}:
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ];
propagatedBuildInputs = [ glib libbonobo libogg ];
}

10
pkgs/top-level/all-packages.nix
View file

@ -9002,13 +9002,12 @@ with pkgs;
inherit (xlibs) libX11 libXext;
};
libcanberra_gtk3 = callPackage ../development/libraries/libcanberra {
gtk = pkgs.gtk3;
};
libcanberra = callPackage ../development/libraries/libcanberra { };
libcanberra_gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; };
libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; };
libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
then pkgs.libcanberra_gtk2.override { gtk = null; }
then pkgs.libcanberra
else pkgs.libcanberra_gtk2;
libcec = callPackage ../development/libraries/libcec { };
@ -18446,14 +18445,13 @@ with pkgs;
} // {
inherit (pkgs)
# GTK Libs
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra_gtk2
# Included for backwards compatibility
libsoup libwnck gtk_doc gnome_doc_utils;
gtk = self.gtk2;
gtkmm = self.gtkmm2;
libcanberra = self.libcanberra_gtk2;
});
gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });