yed: wrap With wrapGAppsHook - fixes #101135

Use preFixup to setup the wrapper properly, without double wrapping.
This commit is contained in:
Doron Behar 2020-10-23 14:45:25 +03:00
parent 630f19b3ef
commit 919df81df1
2 changed files with 16 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchzip, makeWrapper, unzip, jre }:
{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "yEd";
@ -9,16 +9,25 @@ stdenv.mkDerivation rec {
sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq";
};
nativeBuildInputs = [ makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
# For wrapGAppsHook setup hook
buildInputs = [ jre.gtk3 ];
installPhase = ''
dontConfigure = true;
dontBuild = true;
dontInstall = true;
preFixup = ''
mkdir -p $out/yed
cp -r * $out/yed
mkdir -p $out/bin
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
makeWrapper ${jre}/bin/java $out/bin/yed \
''${makeWrapperArgs[@]} \
--add-flags "-jar $out/yed/yed.jar --"
'';
dontWrapGApps = true;
meta = with stdenv.lib; {
license = licenses.unfree;

View file

@ -31,6 +31,10 @@ let
gtk3 gnome_vfs GConf glib
];
passthru = {
inherit gtk3;
};
patches = [
./fix-java-home-jdk10.patch
./read-truststore-from-env-jdk10.patch