From 9acb52ee35257a6fbed9062925cf999ffaed6d8e Mon Sep 17 00:00:00 2001 From: Kek5chen Date: Mon, 4 Nov 2024 00:01:08 +0100 Subject: [PATCH 1/2] maintainers: add kek5chen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c1b474b231b1..9e56de6452403 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11266,6 +11266,12 @@ github = "keenanweaver"; githubId = 37268985; }; + kekschen = { + email = "kx@imkx.dev"; + github = "kek5chen"; + githubId = 52585984; + name = "Kek5chen"; + }; keldu = { email = "mail@keldu.de"; github = "keldu"; From 673e291529eb499c6b29ac9720ccb9387d3bfd93 Mon Sep 17 00:00:00 2001 From: Kek5chen Date: Mon, 4 Nov 2024 00:16:34 +0100 Subject: [PATCH 2/2] openvsp: init at 3.40.1 --- pkgs/by-name/op/openvsp/package.nix | 117 ++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 pkgs/by-name/op/openvsp/package.nix diff --git a/pkgs/by-name/op/openvsp/package.nix b/pkgs/by-name/op/openvsp/package.nix new file mode 100644 index 0000000000000..852d7aea7531f --- /dev/null +++ b/pkgs/by-name/op/openvsp/package.nix @@ -0,0 +1,117 @@ +{ + stdenv, + fetchFromGitHub, + cmake, + git, + pkg-config, + python3, + eigen, + fltk, + glm, + glew, + cminpack, + libxml2, + graphviz, + lib, +}: + +stdenv.mkDerivation rec { + pname = "openvsp"; + version = "3.40.1"; + + src = fetchFromGitHub { + owner = "OpenVSP"; + repo = "OpenVSP"; + rev = "OpenVSP_${version}"; + hash = "sha256-PfXqnd75D06vER7X5w+VOm12mvLbcSe4sxmhtwBmPps="; + }; + + nativeBuildInputs = [ + cmake + python3 + git + ]; + + # swig & doxygen are not included as the build would fail since it tries to call + # "swig -doxygen" which fails Make as this is not a valid command. + # Seems like an upstream problem. + buildInputs = [ + cminpack + eigen + fltk + glew + glm + graphviz + libxml2 + ]; + + preConfigure = '' + mkdir -p build buildlibs + ''; + + configurePhase = '' + runHook preConfigure + + cd buildlibs + + cmake \ + -DVSP_USE_SYSTEM_ADEPT2=false \ + -DVSP_USE_SYSTEM_CLIPPER2=false \ + -DVSP_USE_SYSTEM_CMINPACK=false \ + -DVSP_USE_SYSTEM_CODEELI=false \ + -DVSP_USE_SYSTEM_CPPTEST=false \ + -DVSP_USE_SYSTEM_DELABELLA=false \ + -DVSP_USE_SYSTEM_EIGEN=false \ + -DVSP_USE_SYSTEM_EXPRPARSE=false \ + -DVSP_USE_SYSTEM_FLTK=false \ + -DVSP_USE_SYSTEM_GLEW=false \ + -DVSP_USE_SYSTEM_GLM=false \ + -DVSP_USE_SYSTEM_LIBIGES=false \ + -DVSP_USE_SYSTEM_LIBXML2=false \ + -DVSP_USE_SYSTEM_OPENABF=false \ + -DVSP_USE_SYSTEM_PINOCCHIO=false \ + -DVSP_USE_SYSTEM_STEPCODE=false \ + -DVSP_USE_SYSTEM_TRIANGLE=false \ + $src/Libraries \ + -DCMAKE_BUILD_TYPE=Release + + make -j$cores + + cd ../build + cmake $src/src/ -DVSP_LIBRARY_PATH=$PWD/../buildlibs -DCMAKE_BUILD_TYPE=Release -DVSP_CPACK_GEN=DEB + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + make -j$cores VERBOSE=1 + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/bin + + cp ./vsp/vsp $out/bin + cp ./vsp/vspscript $out/bin + cp ./src/vsp/vspviewer $out/bin + cp ./src/vsp/vspaero $out/bin + cp ./src/vsp/vsploads $out/bin + cp ./vsp_aero/Solver/vspaero $out/bin + cp ./vsp_aero/Solver/vspaero_complex $out/bin + cp ./vsp_aero/Solver/vspaero_opt $out/bin + cp ./vsp_aero/Solver/vspaero_adjoint $out/bin + cp ./vsp_aero/Viewer/vspviewer $out/bin + cp ./vsp_aero/Adb2Load/vsploads $out/bin + ''; + + meta = { + description = "A parametric aircraft geometry tool"; + homepage = "https://openvsp.org/"; + license = lib.licenses.nasa13; + maintainers = with lib.maintainers; [ kekschen ]; + mainProgram = "vsp"; + }; +}