Merge pull request #134509 from cwyc/gnome-backgrounds-stable-dir

gnome-backgrounds: stable image paths

authored by Jan Tojnar and committed by GitHub cae929fa 85b41744

+16
+7
pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
··· 13 13 updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; 14 14 }; 15 15 16 + patches = [ 17 + # Makes the database point to stable paths in /run/current-system/sw/share, which don't decay whenever this package's hash changes. 18 + # This assumes a nixos + gnome system, where this package is installed in environment.systemPackages, 19 + # and /share outputs are included in environment.pathsToLink. 20 + ./stable-dir.patch 21 + ]; 22 + 16 23 nativeBuildInputs = [ meson ninja pkg-config gettext ]; 17 24 18 25 meta = with lib; {
+9
pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch
··· 1 + diff --git a/backgrounds/meson.build b/backgrounds/meson.build 2 + index 2175a16..cf521df 100644 3 + --- a/backgrounds/meson.build 4 + +++ b/backgrounds/meson.build 5 + @@ -1,5 +1,5 @@ 6 + dataconf = configuration_data() 7 + -dataconf.set('BACKGROUNDDIR', backgrounddir) 8 + +dataconf.set('BACKGROUNDDIR', '/run/current-system/sw/share/backgrounds/gnome') 9 + dataconf.set('datadir', datadir)