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

Merge pull request #103142 from hedning/gnome-fixes

Browse Source 
Gnome 3.38 fixes
This commit is contained in:
Tor Hedin Brønner 2020-11-08 20:27:15 +01:00 committed by GitHub
commit 2df2c6b3a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -32,7 +32,7 @@
, xorgserver , xorgserver
, python3 , python3
, wrapGAppsHook , wrapGAppsHook
, libsysprof-capture , sysprof
, desktop-file-utils , desktop-file-utils
, libcap_ng , libcap_ng
, egl-wayland , egl-wayland
@ -110,7 +110,7 @@ let self = stdenv.mkDerivation rec {
libxkbfile libxkbfile
pango pango
pipewire pipewire
libsysprof-capture sysprof
xkeyboard_config xkeyboard_config
xwayland xwayland
wayland-protocols wayland-protocols
@ -128,7 +128,7 @@ let self = stdenv.mkDerivation rec {
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
passthru = { passthru = {
libdir = "${self}/lib/mutter-6"; libdir = "${self}/lib/mutter-7";
tests = { tests = {
libdirExists = runCommand "mutter-libdir-exists" {} '' libdirExists = runCommand "mutter-libdir-exists" {} ''

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

@ -1,6 +1,6 @@
{ stdenv, meson, ninja, gettext, fetchurl { stdenv, meson, ninja, gettext, fetchurl
, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
, itstool, libxml2, python3Packages, libhandy , itstool, libxml2, python3Packages, libhandy_0
, gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: , gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
let let
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
libnotify gnome3.gnome-shell python3Packages.pygobject3 libnotify gnome3.gnome-shell python3Packages.pygobject3
libsoup gnome3.gnome-settings-daemon gnome3.nautilus libsoup gnome3.gnome-settings-daemon gnome3.nautilus
gnome3.mutter gnome3.gnome-desktop gobject-introspection gnome3.mutter gnome3.gnome-desktop gobject-introspection
gnome3.nautilus libhandy gnome3.nautilus libhandy_0
# Makes it possible to select user themes through the `user-theme` extension # Makes it possible to select user themes through the `user-theme` extension
gnome3.gnome-shell-extensions gnome3.gnome-shell-extensions
]; ];