Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 24f36f846455
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 450c9c9c3f40
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 23, 2020

  1. yed: wrap With wrapGAppsHook - fixes #101135 

    Use preFixup to setup the wrapper properly, without double wrapping.
    @doronbehar
    doronbehar committed Oct 23, 2020
    1
    Copy the full SHA
    919df81 View commit details

Commits on Nov 5, 2020

  1. Merge pull request #101456 from doronbehar/pkg/yed 

    yed: wrap With wrapGAppsHook - fixes #101135
    @doronbehar
    doronbehar authored Nov 5, 2020
    Copy the full SHA
    450c9c9 View commit details
Showing with 16 additions and 3 deletions.
  1. +12 −3 pkgs/applications/graphics/yed/default.nix
  2. +4 −0 pkgs/development/compilers/openjdk/default.nix
15 changes: 12 additions & 3 deletions pkgs/applications/graphics/yed/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 4 additions & 0 deletions pkgs/development/compilers/openjdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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