diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
| commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
| tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
| parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
| download | nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2 nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip | |
Merge recent master into staging
Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 311257952712..b9011c0236f3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -108,7 +108,7 @@ let nspr udev (if useOpenSSL then openssl else nss) utillinux alsaLib - gcc bison gperf krb5 + bison gperf krb5 glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage |