diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 9c692865f6e3..d2898ebc7540 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -1,27 +1,39 @@ -{ stdenv, lib, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms, -ngspice, wrapGAppsHook, -kernels ? [ ngspice ] }: +{ stdenv +, lib +, fetchFromGitHub +, flex +, bison +, qtbase +, qttools +, qtsvg +, qtwayland +, wrapQtAppsHook +, libX11 +, cmake +, gperf +, adms +, ngspice +, kernels ? [ ngspice ] +}: stdenv.mkDerivation rec { pname = "qucs-s"; - version = "0.0.22"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "0rrq2ddridc09m6fixdmbngn42xmv8cmdf6r8zzn2s98fqib5qd6"; + sha256 = "sha256-2YyVeeUnLBS1Si9gwEsQLZVG98715dz/v+WCYjB3QlI="; }; - nativeBuildInputs = [ wrapGAppsHook cmake ]; - buildInputs = [ flex bison qt4 libX11 gperf adms ] ++ kernels; + nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; + buildInputs = [ qtbase qttools qtsvg qtwayland libX11 gperf adms ] ++ kernels; - preConfigure = '' - # Make custom kernels avaible from qucs-s - gappsWrapperArgs+=(--prefix PATH ":" ${lib.escapeShellArg (lib.makeBinPath kernels)}) - ''; + # Make custom kernels avaible from qucs-s + qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath kernels) ]; - QTDIR=qt4; + QTDIR = qtbase.dev; doInstallCheck = true; installCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccfbb70db667..f7b1d69f741b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38103,7 +38103,7 @@ with pkgs; qucs = callPackage ../applications/science/electronics/qucs { }; - qucs-s = callPackage ../applications/science/electronics/qucs-s { }; + qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { };