mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge pull request #101456 from doronbehar/pkg/yed
yed: wrap With wrapGAppsHook - fixes #101135
This commit is contained in:
commit
450c9c9c3f
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchzip, makeWrapper, unzip, jre }:
|
{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "yEd";
|
pname = "yEd";
|
||||||
|
@ -9,16 +9,25 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq";
|
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
|
mkdir -p $out/yed
|
||||||
cp -r * $out/yed
|
cp -r * $out/yed
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|
||||||
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
makeWrapper ${jre}/bin/java $out/bin/yed \
|
makeWrapper ${jre}/bin/java $out/bin/yed \
|
||||||
|
''${makeWrapperArgs[@]} \
|
||||||
--add-flags "-jar $out/yed/yed.jar --"
|
--add-flags "-jar $out/yed/yed.jar --"
|
||||||
'';
|
'';
|
||||||
|
dontWrapGApps = true;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
|
|
|
@ -31,6 +31,10 @@ let
|
||||||
gtk3 gnome_vfs GConf glib
|
gtk3 gnome_vfs GConf glib
|
||||||
];
|
];
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
inherit gtk3;
|
||||||
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./fix-java-home-jdk10.patch
|
./fix-java-home-jdk10.patch
|
||||||
./read-truststore-from-env-jdk10.patch
|
./read-truststore-from-env-jdk10.patch
|
||||||
|
|
Loading…
Reference in a new issue