aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix21
1 files changed, 11 insertions, 10 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
index fb261c286072..73a095b0827f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, 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
, libxkbcommon, wayland # ozone/wayland
@@ -22,7 +22,7 @@
# Additional dependencies according to other distros.
## Ubuntu
-, liberation_ttf, curl, utillinux, xdg_utils, wget
+, liberation_ttf, curl, util-linux, xdg_utils, wget
## Arch Linux.
, flac, harfbuzz, icu, libpng, libopus, snappy, speechd
## Gentoo
@@ -38,7 +38,7 @@
, chromium
, gsettings-desktop-schemas
-, gnome2, gnome3
+, gnome3
}:
with stdenv.lib;
@@ -49,8 +49,6 @@ let
};
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 = [
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
@@ -59,13 +57,13 @@ let
dbus gdk-pixbuf gcc-unwrapped.lib
systemd
libexif
- liberation_ttf curl utillinux xdg_utils wget
+ liberation_ttf curl util-linux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa coreutils
libxkbcommon wayland
] ++ optional pulseSupport libpulseaudio
- ++ [ gtk ];
+ ++ [ gtk3 ];
suffix = if channel != "stable" then "-" + channel else "";
@@ -79,10 +77,10 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH
- gsettings-desktop-schemas glib gtk
+ gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
- gnome.adwaita-icon-theme
+ gnome3.adwaita-icon-theme
];
unpackPhase = ''
@@ -150,7 +148,10 @@ in stdenv.mkDerivation {
description = "A freeware web browser developed by Google";
homepage = "https://www.google.com/chrome/browser/";
license = licenses.unfree;
- maintainers = [ maintainers.msteen ];
+ maintainers = with maintainers; [ primeos ];
+ # Note from primeos: By updating Chromium I also update Google Chrome and
+ # will try to merge PRs and respond to issues but I'm not actually using
+ # Google Chrome.
platforms = [ "x86_64-linux" ];
};
}