mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
Merge pull request #134509 from cwyc/gnome-backgrounds-stable-dir
gnome-backgrounds: stable image paths
This commit is contained in:
commit
cae929fadd
|
@ -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; {
|
||||
|
|
|
@ -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)
|
Loading…
Reference in a new issue