summary refs log tree commit diff
path: root/pkgs/data/misc
diff options
context:
space:
mode:
authorDaniƫl de Kok <me@danieldk.eu>2021-05-09 09:57:27 +0200
committerGitHub <noreply@github.com>2021-05-09 09:57:27 +0200
commita35e46c3351a8ba9efff139f5c87af0c7af2007b (patch)
tree00479b52b5640707fb80b7472cfae59dfdffabbe /pkgs/data/misc
parent90c2fb1f2fd0ef3f0e453bc8cd6b28866e079aa0 (diff)
parentc234c5b16dc9a1a66d9bda38dcd8e1eb034e74a3 (diff)
downloadnixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.tar
nixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.tar.gz
nixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.tar.bz2
nixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.tar.lz
nixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.tar.xz
nixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.tar.zst
nixpkgs-a35e46c3351a8ba9efff139f5c87af0c7af2007b.zip
Merge pull request #121938 from danieldk/fedora-backgrounds-34
fedora-backgrounds.f34: init at 34.0.1
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r--pkgs/data/misc/fedora-backgrounds/default.nix11
-rw-r--r--pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch13
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/data/misc/fedora-backgrounds/default.nix
index 31bc28a9f9c..3089e721a7c 100644
--- a/pkgs/data/misc/fedora-backgrounds/default.nix
+++ b/pkgs/data/misc/fedora-backgrounds/default.nix
@@ -20,4 +20,15 @@ in {
     # Fix broken symlinks in the Xfce background directory.
     patches = [ ./f33-fix-xfce-path.patch ];
   };
+
+  f34 = fedoraBackground rec {
+    version = "34.0.1";
+    src = fetchurl {
+      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
+      hash = "sha256-0gotgQ4N0yE8WZbsu7B3jmUIZrycbqjEMxZl01JcJj4=";
+    };
+    # Fix broken symlinks in the Xfce background directory.
+    patches = [ ./f34-fix-xfce-path.patch ];
+  };
+
 }
diff --git a/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch b/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch
new file mode 100644
index 00000000000..84792766713
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch
@@ -0,0 +1,13 @@
+diff --git a/default/Makefile b/default/Makefile
+index 172d5d9..540a1c0 100644
+--- a/default/Makefile
++++ b/default/Makefile
+@@ -1,7 +1,7 @@
+ WP_NAME=f34
+ WP_BIGNAME=F34
+ WP_DIR=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME)
+-WP_DIR_LN=/usr/share/backgrounds/$(WP_NAME)
++WP_DIR_LN=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME)
+ GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties
+ KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers
+ MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties