From 9f719ade9c65ef04e4622c9268cdcedbf3bdda1c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 16:21:03 +0200 Subject: [PATCH 1/2] atomEnv: remove pointless GConf dependency GConf has been unmaintained for ages and Electron removed support for it a while ago: https://github.com/electron/electron/issues/2727 --- pkgs/applications/editors/atom/env.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index e59b03beba85..d0318319caf8 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,13 +1,13 @@ { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk +, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk , at-spi2-core, libdbusmenu, libdrm, mesa }: let packages = [ stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss + fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7889ac2919f8..685cd053c560 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24780,9 +24780,7 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - atomEnv = callPackage ../applications/editors/atom/env.nix { - gconf = gnome2.GConf; - }; + atomEnv = callPackage ../applications/editors/atom/env.nix { }; atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); From d76f600c92e9a0d58f94267d3bd3e9cc77a3b4ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 16:25:38 +0200 Subject: [PATCH 2/2] atomEnv: remove libgnome-keyring dependency libgnome-keyring has been deprecated for a long time. It has been superseded by libsecret, which allows access to not only GNOME Keyring secret manager but any other service implementing the Secret Service D-Bus API. And libsecret is already in the dependencies so presumably it is supported. --- pkgs/applications/editors/atom/env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index d0318319caf8..a5ca5775aae3 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,12 +1,12 @@ { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr +, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr , nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk , at-spi2-core, libdbusmenu, libdrm, mesa }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 + stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr