appcsxcad: migrate to pkgs/by-name, use qt6
This commit is contained in:
+16
-14
@@ -1,40 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
csxcad,
|
||||
qcsxcad,
|
||||
hdf5,
|
||||
vtkWithQt5,
|
||||
qtbase,
|
||||
vtkWithQt6,
|
||||
qt6,
|
||||
fparser,
|
||||
tinyxml,
|
||||
cgal,
|
||||
boost,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "appcsxcad";
|
||||
version = "unstable-2023-01-06";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thliebig";
|
||||
repo = "AppCSXCAD";
|
||||
rev = "379ede4b8e00c11e8d0fb724c35547991b30c423";
|
||||
hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KrsnCnRZRTbkgEH3hOETrYhseg5mCHPqhAbYyHlS3sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
csxcad
|
||||
qcsxcad
|
||||
hdf5
|
||||
vtkWithQt5
|
||||
qtbase
|
||||
vtkWithQt6
|
||||
qt6.qtbase
|
||||
qt6.qtwayland
|
||||
fparser
|
||||
tinyxml
|
||||
cgal
|
||||
@@ -45,12 +47,12 @@ mkDerivation {
|
||||
rm $out/bin/AppCSXCAD.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Minimal Application using the QCSXCAD library";
|
||||
mainProgram = "AppCSXCAD";
|
||||
homepage = "https://github.com/thliebig/AppCSXCAD";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ matthuszagh ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ matthuszagh ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -14824,8 +14824,6 @@ with pkgs;
|
||||
|
||||
### SCIENCE / ELECTRONICS
|
||||
|
||||
appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
|
||||
|
||||
simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; };
|
||||
simulide_1_0_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.0.0"; };
|
||||
simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
|
||||
|
||||
Reference in New Issue
Block a user