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: 43933d2fc00f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0224ebfc4cde
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 2, 2021

  1. electron: fix tray icon in wayland

    @Kazimazi
    Kazimazi committed Jan 2, 2021
    Copy the full SHA
    2320652 View commit details

  2. Merge pull request #108208 from Kazimazi/fix/element-desktop 

    electron: fix tray icon in wayland
    @prusnak
    prusnak authored Jan 2, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0224ebf View commit details
Showing with 3 additions and 1 deletion.
  1. +1 −0 pkgs/development/tools/electron/default.nix
  2. +2 −1 pkgs/development/tools/electron/generic.nix
1 change: 1 addition & 0 deletions pkgs/development/tools/electron/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
, libdrm
, mesa
, libxkbcommon
, libappindicator-gtk3
}@args:

let
3 changes: 2 additions & 1 deletion pkgs/development/tools/electron/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
, libdrm
, mesa
, libxkbcommon
, libappindicator-gtk3
}:

version: hashes:
@@ -56,7 +57,7 @@ let
};

electronLibPath = with stdenv.lib; makeLibraryPath (
[ libuuid at-spi2-atk at-spi2-core ]
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
);