From a108dbc79f209aac0e39203cdca1b17f1ee0a398 Mon Sep 17 00:00:00 2001 From: Jasi Date: Sun, 22 Jun 2025 21:39:47 -0400 Subject: [PATCH 1/3] pop-wallpapers: refactor Makefile handling --- pkgs/by-name/po/pop-wallpapers/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix index 68dec91ce5e7..86006fd80d92 100644 --- a/pkgs/by-name/po/pop-wallpapers/package.nix +++ b/pkgs/by-name/po/pop-wallpapers/package.nix @@ -17,10 +17,20 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-JST5Rt4Ec1lRu62PUt98S2G1vKthAyOSpyCpuCnkGmw="; }; + # 1. Future-proofs calls to imagemagick's convert feature + # 2. Replace hard-coded /usr path to build-system `datadir` + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "convert" "magick" \ + --replace-fail "/usr/share" "\$(datadir)" + ''; + nativeBuildInputs = [ imagemagick ]; makeFlags = [ "prefix=$(out)" ]; + enableParallelBuilding = true; + passthru.updateScript = nix-update-script { }; meta = { From eed41b0b20d40a63bf65103916bc7b875a851c5a Mon Sep 17 00:00:00 2001 From: Jasi Date: Mon, 23 Jun 2025 23:56:55 -0400 Subject: [PATCH 2/3] =?UTF-8?q?pop-wallpapers:=201.0.5=20=E2=86=92=201.0.5?= =?UTF-8?q?-unstable-2025-06-24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/po/pop-wallpapers/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix index 86006fd80d92..fc64a66c6ca6 100644 --- a/pkgs/by-name/po/pop-wallpapers/package.nix +++ b/pkgs/by-name/po/pop-wallpapers/package.nix @@ -8,21 +8,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pop-wallpapers"; - version = "1.0.5"; + version = "1.0.5-unstable-2025-06-24"; src = fetchFromGitHub { owner = "pop-os"; repo = "wallpapers"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-JST5Rt4Ec1lRu62PUt98S2G1vKthAyOSpyCpuCnkGmw="; + rev = "20a9fdd1ed86aadfbbfcd55dc3d2d9eb8ae28e15"; + hash = "sha256-GUXxy+zRdBCsvWW9ytJZUHSw6rGc3uNTjNIsiK3l+zA="; }; - # 1. Future-proofs calls to imagemagick's convert feature - # 2. Replace hard-coded /usr path to build-system `datadir` + # Future-proofs calls to imagemagick's convert feature postPatch = '' - substituteInPlace Makefile \ - --replace-fail "convert" "magick" \ - --replace-fail "/usr/share" "\$(datadir)" + substituteInPlace Makefile --replace-fail "convert" "magick" ''; nativeBuildInputs = [ imagemagick ]; @@ -31,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Wallpapers for Pop!_OS"; From 74a55427badc7e0c8162b0d5a6df5bf190fd59da Mon Sep 17 00:00:00 2001 From: Jasi Date: Mon, 23 Jun 2025 13:11:22 -0400 Subject: [PATCH 3/3] pop-wallpapers: add normalcea as maintainer --- pkgs/by-name/po/pop-wallpapers/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix index fc64a66c6ca6..350d569f99dc 100644 --- a/pkgs/by-name/po/pop-wallpapers/package.nix +++ b/pkgs/by-name/po/pop-wallpapers/package.nix @@ -84,7 +84,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { # tony-webster-97532.jpg publicDomain ]; - maintainers = with lib.maintainers; [ pandapip1 ]; + maintainers = with lib.maintainers; [ + normalcea + pandapip1 + ]; platforms = lib.platforms.all; }; })