From f30919669353bb32f4703f8d8ffb2a9c6d69833e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 21:59:56 +0200 Subject: [PATCH 1/2] keepassxc: fix build on darwin Pulling in a temporary patch for nixpkgs from an open PR. --- flake.nix | 2 +- patches/keepassxc-fix-darwin-build.patch | 26 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 patches/keepassxc-fix-darwin-build.patch diff --git a/flake.nix b/flake.nix index f12afde..20809d2 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ]; + patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; }; # necessary to make the top-level inputs available to system configuration diff --git a/patches/keepassxc-fix-darwin-build.patch b/patches/keepassxc-fix-darwin-build.patch new file mode 100644 index 0000000..3684a24 --- /dev/null +++ b/patches/keepassxc-fix-darwin-build.patch @@ -0,0 +1,26 @@ +From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001 +From: Fernando Rodrigues +Date: Wed, 28 May 2025 14:06:23 -0300 +Subject: [PATCH] keepassxc: remove unecessary dependency + +KIO no longer seems necessary for KeePassXC, so removing it should +decrease the closure size significantly. + +Reported-by: chopper2000uk <> +Signed-off-by: Fernando Rodrigues +--- + pkgs/by-name/ke/keepassxc/package.nix | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix +index 170cc7bfe8e384..40b6dc15170f5b 100644 +--- a/pkgs/by-name/ke/keepassxc/package.nix ++++ b/pkgs/by-name/ke/keepassxc/package.nix +@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { + libXi + libXtst + libargon2 +- libsForQt5.kio + libsForQt5.qtbase + libsForQt5.qtsvg + minizip From d6b3f85c3b0e9a34b327f9c02b50870d23cbe4f7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 22:00:20 +0200 Subject: [PATCH 2/2] fixup! flake, darwin: nixpkgs patching not required anymore with 25.05 --- ...2bc76d359b908ad1389ee28c23ee0e862324.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch diff --git a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch deleted file mode 100644 index dbaf9ee..0000000 --- a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001 -From: Ihar Hrachyshka -Date: Mon, 7 Apr 2025 21:03:09 -0400 -Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4 - -Signed-off-by: Ihar Hrachyshka -(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1) ---- - pkgs/development/web/nodejs/v20.nix | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix -index b9c9345c441afa..20cceb5b5d1cda 100644 ---- a/pkgs/development/web/nodejs/v20.nix -+++ b/pkgs/development/web/nodejs/v20.nix -@@ -50,5 +50,10 @@ buildNodejs { - stripLen = 1; - hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; - }) -+ # fix test failure on macos 15.4 -+ (fetchpatch2 { -+ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; -+ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; -+ }) - ] ++ gypPatches; - }