diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-16 00:17:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 00:17:09 +0000 |
| commit | 85bbf23a75b6d3a31a79f1c9794d7f8a4ffb7e1d (patch) | |
| tree | f4f5848864673cad49531596a156ec72beeeb98c | |
| parent | Merge branch 'staging-21.11' into staging-next-21.11 (diff) | |
| parent | Merge pull request #173178 from DarkOnion0/drawio-backport (diff) | |
| download | nixpkgs-85bbf23a75b6d3a31a79f1c9794d7f8a4ffb7e1d.tar.gz | |
Merge release-21.11 into staging-next-21.11
| -rw-r--r-- | pkgs/applications/graphics/drawio/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/generic.nix | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 02c0fb409110..d4fb7e1a8ae7 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "15.7.3"; + version = "18.0.4"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "3565bcceccb57daee222270164e85b696b8d261ab88b65699912da51946a1c36"; + sha256 = "0ln9vs2zyqq0pz3af6i8ynjbg59j0y6y7f5qkrgk2yv2mpnncl3m"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index eb9752e8d348..c6c9820e9b46 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -62,6 +62,7 @@ let electronLibPath = with lib; makeLibraryPath ( [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] + ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] ++ optionals (! versionOlder version "12.0.0") [ libxshmfence ] ); @@ -93,9 +94,7 @@ let $out/lib/electron/electron \ ${lib.optionalString (! lib.versionOlder version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" } - wrapProgram $out/lib/electron/electron \ - --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ - "''${gappsWrapperArgs[@]}" + wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}" ''; }; |