qucs-s: 0.0.22 -> 1.0.2 (#223378)

* qucs-s: 0.0.22->1.0.1 (including Qt4=>Qt5)

* qucs-s: Qt5->Qt6

* qucs-s: add qtwayland input as recommended for Qt6

Co-authored-by: Tungsten842 <quantmint@protonmail.com>

* qucs-s 1.0.1->1.0.2

---------

Co-authored-by: Tungsten842 <quantmint@protonmail.com>
This commit is contained in:
Ilya 2023-05-06 16:28:29 +02:00 committed by GitHub
parent 54b777d451
commit 32fc1ceac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 13 deletions

View File

@ -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 = ''

View File

@ -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 { };