diff options
author | Evils <evils.devils@protonmail.com> | 2022-10-18 09:32:17 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-12-20 15:14:31 +0100 |
commit | 8a6772fee62923d0854f84a3fac0b8225e7a0e01 (patch) | |
tree | ad7265ff7751d39ecf4245af820930d4538cb131 /pkgs/applications/science/electronics/kicad/base.nix | |
parent | 1c3de7e308dac2798564ae9695a7b0fd1cb3a5c1 (diff) |
kicad: bunch of cleanup
add patch to ensure writability of created projects (upstream issue 12941) disable the qa_eeschema test as it fails to find the ngspice lib which allows re-enabling tests as a whole on unstable there is a patch for this, but it still fails with something else... (upstream issue 12491) and remove ngspice workaround that doesn't work anymore set meta.mainProgram since for kicad-unstable, the binary isn't called kicad-unstable
Diffstat (limited to 'pkgs/applications/science/electronics/kicad/base.nix')
-rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 5a257e26d2627..d7250db07b491 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -33,6 +33,7 @@ , dbus , at-spi2-core , libXtst +, pcre2 , swig4 , python @@ -67,6 +68,11 @@ stdenv.mkDerivation rec { src = kicadSrc; + patches = [ + # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) + ./writable.patch + ]; + # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here @@ -114,6 +120,9 @@ stdenv.mkDerivation rec { ] ++ optionals (!withPCM && stable) [ "-DKICAD_PCM=OFF" + ] + ++ optionals (!stable) [ # upstream issue 12491 + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -136,6 +145,7 @@ stdenv.mkDerivation rec { dbus at-spi2-core libXtst + pcre2 ]; buildInputs = [ @@ -162,14 +172,10 @@ stdenv.mkDerivation rec { ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt - ++ optional (debug) valgrind - ; - - # started becoming necessary halfway into 2022, not sure what changed to break a test... - preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ]; + ++ optional (debug) valgrind; # debug builds fail all but the python test - doInstallCheck = !(!stable || debug); + doInstallCheck = !(debug); installCheckTarget = "test"; dontStrip = debug; |