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

gnome3.gnome-desktop: fix thumbnailing with missing fontconfig cache (#56346)

Browse Source 
Also use @storeDir@ instead of hardcoded /nix/store
This commit is contained in:
Tor Hedin Brønner 2019-02-25 20:04:28 +01:00 committed by GitHub
parent 81fa512bd8
commit 9202c5ab8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
View File

@ -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);

8
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -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";
})
];