git.iko.soy/typeable/nixpkgs
on master help sign in
google-chrome: Cleanup old conditionals
commitb20cd4113f2386ec84eb9a2f84e3a8c190f6a5d0 authorMichael Weiss <dev.primeos@gmail.com> dateSun 29 Nov 2020, 11:19 (6 years ago) parent29f1edf
1 file changed+5−7
pkgs/applications/networking/browsers/google-chrome/default.nix+5−7
pkgs/applications/networking/browsers/google-chrome/default.nix+5−7
@@ -4,7 +4,7 @@
44, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
55, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
66, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
7−, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
7+, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
88, kerberos, libdrm, mesa
99, libxkbcommon, wayland # ozone/wayland
1010
@@ -38,7 +38,7 @@
3838, chromium
3939
4040, gsettings-desktop-schemas
41−, gnome2, gnome3
41+, gnome3
4242}:
4343
4444with stdenv.lib;
@@ -49,8 +49,6 @@ let
4949 };
5050
5151 version = chromium.upstream-info.version;
52− gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
53− gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
5452
5553 deps = [
5654 glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
@@ -65,7 +63,7 @@ let
6563 kerberos libdrm mesa coreutils
6664 libxkbcommon wayland
6765 ] ++ optional pulseSupport libpulseaudio
68− ++ [ gtk ];
66+ ++ [ gtk3 ];
6967
7068 suffix = if channel != "stable" then "-" + channel else "";
7169
@@ -79,10 +77,10 @@ in stdenv.mkDerivation {
7977 nativeBuildInputs = [ patchelf makeWrapper ];
8078 buildInputs = [
8179 # needed for GSETTINGS_SCHEMAS_PATH
82− gsettings-desktop-schemas glib gtk
80+ gsettings-desktop-schemas glib gtk3
8381
8482 # needed for XDG_ICON_DIRS
85− gnome.adwaita-icon-theme
83+ gnome3.adwaita-icon-theme
8684 ];
8785
8886 unpackPhase = ''