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

chromium: Minimize the diff to nixos-unstable

Browse Source 
Keeping the diff minimal makes backporting updates easier.
This is basically e9e5f5f84de backported for Chromium.
This commit is contained in:
Michael Weiss 2021-06-10 19:37:39 +02:00
parent 0950b449b5
commit 81c33c7969
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -9,7 +9,7 @@
, python2, python3, perl, pkg-config , python2, python3, perl, pkg-config
, nspr, systemd, libkrb5 , nspr, systemd, libkrb5
, util-linux, alsaLib , util-linux, alsa-lib
, bison, gperf , bison, gperf
, glib, gtk3, dbus-glib , glib, gtk3, dbus-glib
, glibc , glibc
@ -143,7 +143,7 @@ let
buildInputs = defaultDependencies ++ [ buildInputs = defaultDependencies ++ [
nspr nss systemd nspr nss systemd
util-linux alsaLib util-linux alsa-lib
bison gperf libkrb5 bison gperf libkrb5
glib gtk3 dbus-glib glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
@ -205,7 +205,7 @@ let
substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ substituteInPlace services/audio/audio_sandbox_hook_linux.cc \
--replace \ --replace \
'/usr/share/alsa/' \ '/usr/share/alsa/' \
'${alsaLib}/share/alsa/' \ '${alsa-lib}/share/alsa/' \
--replace \ --replace \
'/usr/lib/x86_64-linux-gnu/gconv/' \ '/usr/lib/x86_64-linux-gnu/gconv/' \
'${glibc}/lib/gconv/' \ '${glibc}/lib/gconv/' \

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

@ -3,7 +3,7 @@
# Linked dynamic libraries. # Linked dynamic libraries.
, 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, libxshmfence, expat, cups , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, libkrb5, libdrm, mesa , libkrb5, libdrm, mesa
, libxkbcommon, wayland # ozone/wayland , libxkbcommon, wayland # ozone/wayland
@ -59,7 +59,7 @@ let
deps = [ deps = [
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 libxshmfence expat cups alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups
dbus gdk-pixbuf gcc-unwrapped.lib dbus gdk-pixbuf gcc-unwrapped.lib
systemd systemd
libexif pciutils libexif pciutils

1
pkgs/top-level/all-packages.nix
View File

@ -19970,6 +19970,7 @@ in
alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { };
alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaLib = callPackage ../os-specific/linux/alsa-lib { };
alsa-lib = alsaLib; # New name on nixos-unstable
alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };