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

gnome3.gtk -> gtk3

Browse Source 
fix evaluation when config.allowAliases == false

(regression after #55735)
This commit is contained in:
volth
2019-03-09 11:41:12 +00:00
committed by worldofpeace
parent 5bf6a13417
commit 2be90ccb4f
24 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/audio/gvolicon/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation {
name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
librsvg wrapGAppsHook
];

4
pkgs/tools/graphics/luxcorerender/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gnome3.gtk
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
makeWrapper

5
pkgs/tools/networking/network-manager/strongswan.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
, gnome3, libsecret }:
, gtk3, gnome3, libsecret }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
};
buildInputs = [ networkmanager strongswanNM libsecret ]
++ (with gnome3; [ gtk networkmanagerapplet ]);
buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];

6
pkgs/tools/networking/uget/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null
libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
}:
stdenv.mkDerivation rec {
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
intltool
wrapGAppsHook
];
buildInputs = [
openssl
curl
libnotify
libappindicator-gtk3
gnome3.gtk
gtk3
(stdenv.lib.getLib gnome3.dconf)
]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])