diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 729e78ccb5a7..ab5632cf143b 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -25,12 +25,9 @@ swig, webkitgtk_4_0, wrapGAppsHook3, - python ? null, - enablePython ? false, + python3, }: -assert enablePython -> (python != null); - stdenv.mkDerivation rec { pname = "gnucash"; version = "5.11"; @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config ]; - cmakeFlags = lib.optional enablePython [ + cmakeFlags = [ "-DWITH_PYTHON=\"ON\"" "-DPYTHON_SYSCONFIG_BUILD=\"$out\"" ]; @@ -72,13 +69,13 @@ stdenv.mkDerivation rec { libxslt swig webkitgtk_4_0 + python3 ] ++ (with perlPackages; [ JSONParse FinanceQuote perl - ]) - ++ lib.optional enablePython python; + ]); patches = [ # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aec660de7c84..3772c02a52e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5605,10 +5605,11 @@ self: super: with self; { gntp = callPackage ../development/python-modules/gntp { }; - gnucash = toPythonModule (pkgs.gnucash.override { - inherit (self) python; - enablePython = true; - }); + gnucash = toPythonModule ( + pkgs.gnucash.override { + python3 = python; + } + ); gnureadline = callPackage ../development/python-modules/gnureadline { };