kicad: link utils; clean up wrapper installPhase

This commit is contained in:
Evils 2020-04-05 21:23:36 +02:00
parent 95e4e33bdf
commit 1059fdf143

View File

@ -85,34 +85,27 @@ stdenv.mkDerivation rec {
++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ] ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]
; ;
# dunno why i have to add $makeWrapperArgs manually... # why does $makeWrapperArgs have to be added explicitly?
# $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?
# not sure if anything has to be done with the other stuff in base/bin # kicad-ogltest's source seems to indicate that crashing is expected behaviour...
# dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest installPhase = with lib;
installPhase = let
optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ];
'' + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ];
'' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' in
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" ( concatStringsSep "\n"
'' + ( flatten [
'' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' ( optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n" )
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' + # wrap each of the directly usable tools
'' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' ( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs"
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\""
'' + ) tools )
'' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" # link in the CLI utils
'' + ( map ( util: "ln -s ${base}/bin/${util} $out/bin/${util}" ) utils )
'' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' ])
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" )
'' +
'' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
'' +
'' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs ''
+ optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
''
; ;
# can't run this for each pname # can't run this for each pname