diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-08-04 00:15:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-04 00:15:47 +0200 |
commit | 20c68fb71db920e4a37305eb5a977ce20e700fe9 (patch) | |
tree | c1396e94afe88e86baa40bae7dc0f1b1fa9b6a07 /pkgs/applications/office | |
parent | 9623e3221b39c8ed73db7d3d2457801e806ec734 (diff) | |
parent | 7d933d4c347ea7d0ca2763a689c3437709eede09 (diff) |
Merge pull request #183969 from Shawn8901/jameica-gsetting-schema
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/jameica/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 55e24d80f2773..d4a3028b8943f 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, wrapGAppsHook, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let _version = "2.10.2"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "jameica"; inherit version; - nativeBuildInputs = [ ant jdk makeWrapper ]; + nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] ++ lib.optional stdenv.isDarwin Cocoa; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "1x9sybknzsfxp9z0pvw9dx80732ynyap57y03p7xwwjbcrnjla57"; }; + dontWrapGApps = true; + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries # and is not able to build the application itself buildPhase = '' @@ -53,13 +55,16 @@ stdenv.mkDerivation rec { install -Dm644 plugin.xml $out/share/java/ install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png cp ${desktopItem}/share/applications/* $out/share/applications/ + ''; + postFixup = '' makeWrapper ${jre}/bin/java $out/bin/jameica \ --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ - --chdir "$out/share/java/" + --chdir "$out/share/java/" \ + "''${gappsWrapperArgs[@]}" ''; meta = with lib; { @@ -71,7 +76,7 @@ stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # source bundles dependencies as jars + binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; |