diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-10-23 14:45:25 +0300 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2020-10-23 14:45:25 +0300 |
commit | 919df81df148c244ca1bcf946997b76d95ff77e0 (patch) | |
tree | a1d1c8b4b8b1bcef01b9e166afdee71e10ade655 /pkgs/applications/graphics/yed | |
parent | 630f19b3ef9cebef1b85bc5c8c6e1fe2a3c6aa01 (diff) |
yed: wrap With wrapGAppsHook - fixes #101135
Use preFixup to setup the wrapper properly, without double wrapping.
Diffstat (limited to 'pkgs/applications/graphics/yed')
-rw-r--r-- | pkgs/applications/graphics/yed/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index f92e910eacce7..7eb0851834fcd 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -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; |