pyrox.dev
google-chrome: Cleanup old conditionals
+5
-7
pkgs/applications/networking/browsers/google-chrome/default.nix
+5
-7
pkgs/applications/networking/browsers/google-chrome/default.nix
···
4
4
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
5
5
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
6
6
, 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
8
8
, kerberos, libdrm, mesa
9
9
, libxkbcommon, wayland # ozone/wayland
10
10
···
38
38
, chromium
39
39
40
40
, gsettings-desktop-schemas
41
-
, gnome2, gnome3
41
+
, gnome3
42
42
}:
43
43
44
44
with stdenv.lib;
···
49
49
};
50
50
51
51
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;
54
52
55
53
deps = [
56
54
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
···
65
63
kerberos libdrm mesa coreutils
66
64
libxkbcommon wayland
67
65
] ++ optional pulseSupport libpulseaudio
68
-
++ [ gtk ];
66
+
++ [ gtk3 ];
69
67
70
68
suffix = if channel != "stable" then "-" + channel else "";
71
69
···
79
77
nativeBuildInputs = [ patchelf makeWrapper ];
80
78
buildInputs = [
81
79
# needed for GSETTINGS_SCHEMAS_PATH
82
-
gsettings-desktop-schemas glib gtk
80
+
gsettings-desktop-schemas glib gtk3
83
81
84
82
# needed for XDG_ICON_DIRS
85
-
gnome.adwaita-icon-theme
83
+
gnome3.adwaita-icon-theme
86
84
];
87
85
88
86
unpackPhase = ''