public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcsxcad: migrate to Qt511 + additional cleanup

Browse Source 
* Split into multiple outputs
 * Rewrite the derivation without stdenv
This commit is contained in:
freezeboy 2020-11-05 16:35:59 +01:00
parent 6683f3bf65
commit ed7a64c4ee
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/electronics/qcsxcad/default.nix → pkgs/development/libraries/science/electronics/qcsxcad/default.nix
View File

@ -1,11 +1,10 @@
{ stdenv { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, csxcad , csxcad
, tinyxml , tinyxml
, vtkWithQt5 , vtkWithQt5
, wrapQtAppsHook
, qtbase , qtbase
}: }:
@ -20,13 +19,13 @@ mkDerivation {
sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn";
}; };
outputs = [ "out" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
wrapQtAppsHook
]; ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DCSXCAD_ROOT_DIR=${csxcad}" "-DCSXCAD_ROOT_DIR=${csxcad}"
"-DENABLE_RPATH=OFF" "-DENABLE_RPATH=OFF"
]; ];
@ -40,7 +39,7 @@ mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "Qt library for CSXCAD"; description = "Qt library for CSXCAD";
homepage = "https://github.com/thliebig/QCSXCAD"; homepage = "https://github.com/thliebig/QCSXCAD";
license = licenses.gpl3; license = licenses.gpl3;

1
pkgs/top-level/aliases.nix
View File

@ -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-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 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 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
quake3game = ioquake3; # added 2016-01-14 quake3game = ioquake3; # added 2016-01-14
qvim = throw "qvim has been removed."; # added 2020-08-31 qvim = throw "qvim has been removed."; # added 2020-08-31
qwt6 = libsForQt5.qwt; # added 2015-12-19 qwt6 = libsForQt5.qwt; # added 2015-12-19

4
pkgs/top-level/all-packages.nix
View File

@ -15446,6 +15446,8 @@ in
qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
qmltermwidget = callPackage ../development/libraries/qmltermwidget { qmltermwidget = callPackage ../development/libraries/qmltermwidget {
inherit (darwin.apple_sdk.libs) utmp; inherit (darwin.apple_sdk.libs) utmp;
}; };
@ -26870,8 +26872,6 @@ in
pcb = callPackage ../applications/science/electronics/pcb { }; pcb = callPackage ../applications/science/electronics/pcb { };
qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { };
qucs = callPackage ../applications/science/electronics/qucs { }; qucs = callPackage ../applications/science/electronics/qucs { };
xcircuit = callPackage ../applications/science/electronics/xcircuit { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { };