google-chrome: Cleanup old conditionals

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