diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2019-03-07 20:50:13 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-03-07 20:50:13 +0100 |
| commit | 4901dc4e74145e6cad839909ad8e24b672e32d2f (patch) | |
| tree | 7cc6604caa803ecae1108462345015b99331e452 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | f161478646215040b7aac0501a7f22ec0598a0a9 (diff) | |
| parent | 9ae406c0749bbc7373d7422edeaf6b1b6caa0dae (diff) | |
| download | nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.tar nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.tar.gz nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.tar.bz2 nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.tar.lz nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.tar.xz nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.tar.zst nixlib-4901dc4e74145e6cad839909ad8e24b672e32d2f.zip | |
Merge commit '9ae406c0749bbc7373d7422edeaf6b1b6caa0dae' of github.com:NixOS/nixpkgs into fix-chromium
fixes https://github.com/NixOS/nixpkgs/pull/49797
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5d59f7514c60..36576df4b732 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus-glib +, glib, gtk3, dbus-glib , glibc , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups @@ -104,7 +104,7 @@ let else result; base = rec { - name = "${packageName}-${version}"; + name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; inherit packageName buildType buildPath; @@ -120,7 +120,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus-glib + glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage at-spi2-core ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -132,6 +132,8 @@ let patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch + ./patches/jumbo-sorted.patch + ./patches/no-build-timestamps.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. |