From f3463053c54c93acbf65c9efaa233a526494830c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Apr 2026 08:19:13 +0300 Subject: [PATCH 1/2] qalculate-gtk: add 2 semantic spacings Co-Authored-By: Miles Wirht --- pkgs/by-name/qa/qalculate-gtk/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix index cbbe1ae1cfd8..756abf435643 100644 --- a/pkgs/by-name/qa/qalculate-gtk/package.nix +++ b/pkgs/by-name/qa/qalculate-gtk/package.nix @@ -30,11 +30,13 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ libqalculate gtk3 curl ]; + enableParallelBuilding = true; meta = { From 9d92cbe427032331b77d3b4b09c008765d19adc7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Apr 2026 08:22:20 +0300 Subject: [PATCH 2/2] qalculate-gtk: fix darwin build Fix #514605 . Co-Authored-By: Miles Wirht --- pkgs/by-name/qa/qalculate-gtk/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix index 756abf435643..06bb06c1ae64 100644 --- a/pkgs/by-name/qa/qalculate-gtk/package.nix +++ b/pkgs/by-name/qa/qalculate-gtk/package.nix @@ -2,10 +2,12 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, pkg-config, libqalculate, gtk3, + gtk-mac-integration-gtk3, curl, wrapGAppsHook3, desktopToDarwinBundle, @@ -22,6 +24,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JZfolSRLRLtv529f25lEPYOlz+y+EdRqKA0Y5d1dK3s="; }; + patches = [ + # Is meaningfull only for Darwin but is better applying unconditionally. + # Can be removed in 5.11 probably, see: + # https://github.com/Qalculate/qalculate-gtk/pull/705 + (fetchpatch { + url = "https://github.com/Qalculate/qalculate-gtk/commit/2f1b6a32d98f122d44d158c20f79a5b9aaf9669f.patch"; + hash = "sha256-v9T8wWvqlI9l6BUszf/575qmoFvh88Cdj/m2XqV8Q4k="; + }) + ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ @@ -35,6 +47,9 @@ stdenv.mkDerivation (finalAttrs: { libqalculate gtk3 curl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gtk-mac-integration-gtk3 ]; enableParallelBuilding = true;