b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #229225 from foo-dogsquared/update-fedora-backgrounds

Browse source 
fedora-backgrounds: init f35 to f38
This commit is contained in:
Weijia Wang 2023-05-03 13:44:52 +03:00 committed by GitHub
parent f971d83adf f437672b0b
commit cb28de1fc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/data/misc/fedora-backgrounds/default.nix
View file

@ -31,4 +31,37 @@ in {
patches = [ ./f34-fix-xfce-path.patch ];
};
f35 = fedoraBackground rec {
version = "35.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-7t78sQ0BIkzgJ+phO55Bomyz02d8Vx1LAtSkjX8ppgE=";
};
# Fix broken symlinks in the Xfce background directory.
patches = [ ./f35-fix-xfce-path.patch ];
};
f36 = fedoraBackground rec {
version = "36.1.2";
src = fetchurl {
url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
hash = "sha256-DZr1YHltojl02X/3sErqB/29JBDy/7lDZKnHD+KouHc=";
};
};
f37 = fedoraBackground rec {
version = "37.0.5";
src = fetchurl {
url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
hash = "sha256-bkjxJDDU0dZURKIK1sd+EOnPt9vvJ5HqHkc6OhPBBn0=";
};
};
f38 = fedoraBackground rec {
version = "38.1.1";
src = fetchurl {
url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
hash = "sha256-YSNP7GhS5i5mJDsa4UwsXJm8Tv43r9JxrcYIbkXQKm4=";
};
};
}

26
pkgs/data/misc/fedora-backgrounds/f35-fix-xfce-path.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/default/Makefile b/default/Makefile
index 2041ce2..f31a0f2 100644
--- a/default/Makefile
+++ b/default/Makefile
@@ -1,7 +1,7 @@
WP_NAME=f35
WP_BIGNAME=F35
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
diff --git a/extras/Makefile b/extras/Makefile
index 95e92e4..4d43a22 100644
--- a/extras/Makefile
+++ b/extras/Makefile
@@ -45,7 +45,7 @@ install:
$(LN_S) ../../../../backgrounds/f35/extras/$${theme}.png \
$(KDE_BG_DIR)/F35_$${theme}/contents/images/$${res}.png ; \
done; \
- $(LN_S) ../backgrounds/f35/extras/$${theme}.png \
+ $(LN_S) ../../backgrounds/f35/extras/$${theme}.png \
$(XFCE_BG_DIR)/f35-$${theme}.png ;\
done;

5
pkgs/data/misc/fedora-backgrounds/generic.nix
View file

@ -31,6 +31,11 @@ stdenvNoCC.mkDerivation {
installFlags = [
"DESTDIR=$(out)"
# The Xfce background directory is assumed to be in installed in an
# FHS-compliant system. This is only effective for v36.0.0 and later
# versions where the following variable is used.
"WP_DIR_LN=$(DESTDIR)/share/backgrounds/$(WP_NAME)"
];
meta = with lib; {