diff options
Diffstat (limited to 'pkgs/development/tools/electron/common.nix')
| -rw-r--r-- | pkgs/development/tools/electron/common.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 19725cc8f148a..497a321c3f140 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -42,12 +42,16 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionOlder info.version "28") + patches = base.patches ++ lib.optional (lib.versionOlder info.version "27") (substituteAll { name = "version.patch"; - src = if lib.versionAtLeast info.version "27" then ./version.patch else ./version-old.patch; + src = ./version.patch; inherit (info) version; }) + + # we remove the web_tests directory in the chromium src FOD to reduce the output size, but this backported patch includes patches on web_tests + ++ lib.optional (lib.versions.major info.version == "26") + ./electron-26-remove-web_tests-patch.patch ; unpackPhase = '' @@ -165,9 +169,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { enable_widevine = false; use_perfetto_client_library = false; enable_check_raw_ptr_fields = false; - } // lib.optionalAttrs (lib.versionOlder info.version "26") { - use_gnome_keyring = false; - } // lib.optionalAttrs (lib.versionAtLeast info.version "28") { + } // lib.optionalAttrs (lib.versionAtLeast info.version "27") { override_electron_version = info.version; }; |