diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-02-25 20:04:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 20:04:28 +0100 |
| commit | 9202c5ab8fb01bf842e76220542958db2a609997 (patch) | |
| tree | b1b96ba597e68a531576170c00e9df9ae0a0dead | |
| parent | 81fa512bd82b5a856e0383c4930e8312bff644fb (diff) | |
| download | nixlib-9202c5ab8fb01bf842e76220542958db2a609997.tar nixlib-9202c5ab8fb01bf842e76220542958db2a609997.tar.gz nixlib-9202c5ab8fb01bf842e76220542958db2a609997.tar.bz2 nixlib-9202c5ab8fb01bf842e76220542958db2a609997.tar.lz nixlib-9202c5ab8fb01bf842e76220542958db2a609997.tar.xz nixlib-9202c5ab8fb01bf842e76220542958db2a609997.tar.zst nixlib-9202c5ab8fb01bf842e76220542958db2a609997.zip | |
gnome3.gnome-desktop: fix thumbnailing with missing fontconfig cache (#56346)
Also use @storeDir@ instead of hardcoded /nix/store
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 6c5989896cb3..57eb4b3d44a9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -8,7 +8,7 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 6161ccde675a..bac8504eeec9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland +, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + (fetchpatch { + name = "fix-missing-font-cache"; + url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; + sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; }) ]; |