Commit f71ad204 authored by Evan Goode's avatar Evan Goode Committed by Tony Wasserka
Browse files

processing: make wrappers in preFixup, not installPhase

If we create the wrappers before preFixup, gappsWrapperArgs will not
have been fully populated yet and we don't get the $XDG_DATA_DIRS added
to the wrapper, leading to a "No GSettings schemas are installed on the
system" when opening the Open file dialog
parent 6831ca6f
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -127,16 +127,18 @@ stdenv.mkDerivation rec {
    cp -dpr build/linux/work $out/share/${pname}
    rmdir $out/share/${pname}/java
    ln -s ${jdk} $out/share/${pname}/java
    runHook postInstall
  '';

  preFixup = ''
    makeWrapper $out/share/${pname}/processing $out/bin/processing \
      ''${gappsWrapperArgs[@]} \
      "''${gappsWrapperArgs[@]}" \
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
    makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \
      ''${gappsWrapperArgs[@]} \
      "''${gappsWrapperArgs[@]}" \
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"

    runHook postInstall
  '';

  meta = with lib; {