diff options
| author | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-05 16:35:59 +0100 |
|---|---|---|
| committer | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-20 22:24:18 +0100 |
| commit | ed7a64c4eeb26477ac6a806d3f1a873569201c50 (patch) | |
| tree | d60a0976d997aff4a9e59fc0a72f9c5ac519cad3 | |
| parent | 6683f3bf65de78bc02320d46e255d17b0d28043b (diff) | |
qcsxcad: migrate to Qt511 + additional cleanup
* Split into multiple outputs
* Rewrite the derivation without stdenv
| -rw-r--r-- | pkgs/development/libraries/science/electronics/qcsxcad/default.nix (renamed from pkgs/applications/science/electronics/qcsxcad/default.nix) | 9 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index c12678c0047d..7e73354363ea 100644 --- a/pkgs/applications/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -1,11 +1,10 @@ -{ stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake , csxcad , tinyxml , vtkWithQt5 -, wrapQtAppsHook , qtbase }: @@ -20,13 +19,13 @@ mkDerivation { sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake - wrapQtAppsHook ]; cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DCSXCAD_ROOT_DIR=${csxcad}" "-DENABLE_RPATH=OFF" ]; @@ -40,7 +39,7 @@ mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt library for CSXCAD"; homepage = "https://github.com/thliebig/QCSXCAD"; license = licenses.gpl3; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ddd94bc9b9a4..3731cf64f778 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -471,6 +471,7 @@ mapAliases ({ phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 + qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7249629a3b21..159d82d6c85f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15446,6 +15446,8 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; @@ -26870,8 +26872,6 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; - qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; - qucs = callPackage ../applications/science/electronics/qucs { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { }; |