public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google-chrome: Cleanup old conditionals

Browse Source
This commit is contained in:
Michael Weiss 2020-11-29 11:19:42 +01:00
parent 29f1edf2f3
commit b20cd4113f
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa , kerberos, libdrm, mesa
, libxkbcommon, wayland # ozone/wayland , libxkbcommon, wayland # ozone/wayland
@ -38,7 +38,7 @@
, chromium , chromium
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gnome2, gnome3 , gnome3
}: }:
with stdenv.lib; with stdenv.lib;
@ -49,8 +49,6 @@ let
}; };
version = chromium.upstream-info.version; version = chromium.upstream-info.version;
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
deps = [ deps = [
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
@ -65,7 +63,7 @@ let
kerberos libdrm mesa coreutils kerberos libdrm mesa coreutils
libxkbcommon wayland libxkbcommon wayland
] ++ optional pulseSupport libpulseaudio ] ++ optional pulseSupport libpulseaudio
++ [ gtk ]; ++ [ gtk3 ];
suffix = if channel != "stable" then "-" + channel else ""; suffix = if channel != "stable" then "-" + channel else "";
@ -79,10 +77,10 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ patchelf makeWrapper ]; nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [ buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH # needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gtk gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS # needed for XDG_ICON_DIRS
gnome.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];
unpackPhase = '' unpackPhase = ''