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

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

Browse Source 
gnome-backgrounds: stable image paths
This commit is contained in:
Jan Tojnar 2021-10-21 02:57:49 +02:00 committed by GitHub
commit cae929fadd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
View File

@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; };
};
patches = [
# Makes the database point to stable paths in /run/current-system/sw/share, which don't decay whenever this package's hash changes.
# This assumes a nixos + gnome system, where this package is installed in environment.systemPackages,
# and /share outputs are included in environment.pathsToLink.
./stable-dir.patch
];
nativeBuildInputs = [ meson ninja pkg-config gettext ];
meta = with lib; {

9
pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch Normal file
View File

@ -0,0 +1,9 @@
diff --git a/backgrounds/meson.build b/backgrounds/meson.build
index 2175a16..cf521df 100644
--- a/backgrounds/meson.build
+++ b/backgrounds/meson.build
@@ -1,5 +1,5 @@
dataconf = configuration_data()
-dataconf.set('BACKGROUNDDIR', backgrounddir)
+dataconf.set('BACKGROUNDDIR', '/run/current-system/sw/share/backgrounds/gnome')
dataconf.set('datadir', datadir)