Unverified Commit 930dee98 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

swt: 4.5 -> 4.33 & more (#347022)

parents bfae445b c70579b0

pkgs/applications/networking/p2p/vuze/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -26,5 +26,8 @@ stdenv.mkDerivation rec { 
    license = licenses.unfree;

    platforms = platforms.all;

    maintainers = [ ];

    # Doesn't launch, gives java related incompatibilities errors. Probably

    # related to swt. Same error happens with swt_jdk8

    broken = true;

  };

}

pkgs/by-name/da/dataexplorer/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ 
, ant

# executable fails to start for jdk > 17

, jdk17

, swt

, makeWrapper

, strip-nondeterminism

}:



stdenv.mkDerivation (finalAttrs: {

}: let

  swt-jdk17 = swt.override { jdk = jdk17; };

in stdenv.mkDerivation (finalAttrs: {

  pname = "dataexplorer";

  version = "3.9.0";
@@ -40,12 +41,15 @@ stdenv.mkDerivation (finalAttrs: { 
    runHook preInstall



    ant -Dprefix=$out/share/ -f build/build.xml install

    # Use SWT from nixpkgs

    ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar"



    # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer

    # but it hardcodes bash shebang and does not pin the java path.

    # So we create our own wrapper, using similar cmdline args as upstream.

    mkdir -p $out/bin

    makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \

      --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \

      --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \

      --set SWT_GTK3 0

pkgs/by-name/db/dbeaver-bin/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  autoPatchelfHook,

  wrapGAppsHook3,

  gtk3,

  swt,

  glib,

  webkitgtk_4_0,

  glib-networking,
@@ -65,11 +64,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
        makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \

          --prefix PATH : "${openjdk17}/bin" \

          --set JAVA_HOME "${openjdk17.home}" \

          --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \

          --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \

          --prefix LD_LIBRARY_PATH : "$out/lib:${

            lib.makeLibraryPath [

              swt

              gtk3

              glib

              webkitgtk_4_0

pkgs/by-name/po/portfolio/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  makeDesktopItem,

  openjdk17,

  stdenvNoCC,

  swt,

  webkitgtk_4_0,

  wrapGAppsHook3,

  gitUpdater,
@@ -29,7 +28,6 @@ let 
    glib-networking

    gtk3

    libsecret

    swt

    webkitgtk_4_0

  ];

in
@@ -56,7 +54,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


    makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \

      --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \

      --prefix CLASSPATH : "${swt}/jars/swt.jar" \

      --prefix PATH : ${openjdk17}/bin



    # Create desktop item

pkgs/by-name/sw/swt/awt-libs.patch

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
--- a/make_linux.mak

+++ b/make_linux.mak

@@ -63,4 +63,4 @@



 AWT_LFLAGS = -shared ${SWT_LFLAGS}

-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt

+AWT_LIBS = `pkg-config --libs x11` -L$(AWT_LIB_PATH) -ljawt