chromium: Minimize the diff to nixos-unstable
Keeping the diff minimal makes backporting updates easier. This is basically e9e5f5f84de backported for Chromium.
This commit is contained in:
parent
0950b449b5
commit
81c33c7969
|
@ -9,7 +9,7 @@
|
|||
|
||||
, python2, python3, perl, pkg-config
|
||||
, nspr, systemd, libkrb5
|
||||
, util-linux, alsaLib
|
||||
, util-linux, alsa-lib
|
||||
, bison, gperf
|
||||
, glib, gtk3, dbus-glib
|
||||
, glibc
|
||||
|
@ -143,7 +143,7 @@ let
|
|||
|
||||
buildInputs = defaultDependencies ++ [
|
||||
nspr nss systemd
|
||||
util-linux alsaLib
|
||||
util-linux alsa-lib
|
||||
bison gperf libkrb5
|
||||
glib gtk3 dbus-glib
|
||||
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
|
||||
|
@ -205,7 +205,7 @@ let
|
|||
substituteInPlace services/audio/audio_sandbox_hook_linux.cc \
|
||||
--replace \
|
||||
'/usr/share/alsa/' \
|
||||
'${alsaLib}/share/alsa/' \
|
||||
'${alsa-lib}/share/alsa/' \
|
||||
--replace \
|
||||
'/usr/lib/x86_64-linux-gnu/gconv/' \
|
||||
'${glibc}/lib/gconv/' \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Linked dynamic libraries.
|
||||
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
|
||||
, 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
|
||||
, libkrb5, libdrm, mesa
|
||||
, libxkbcommon, wayland # ozone/wayland
|
||||
|
@ -59,7 +59,7 @@ let
|
|||
deps = [
|
||||
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
|
||||
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
|
||||
systemd
|
||||
libexif pciutils
|
||||
|
|
|
@ -19970,6 +19970,7 @@ in
|
|||
alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { };
|
||||
|
||||
alsaLib = callPackage ../os-specific/linux/alsa-lib { };
|
||||
alsa-lib = alsaLib; # New name on nixos-unstable
|
||||
|
||||
alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };
|
||||
|
||||
|
|
Loading…
Reference in New Issue