diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-11-20 04:49:49 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-11-20 04:55:45 +0100 |
| commit | a76e28b54c6a9d7c6600e3e0259070257a018700 (patch) | |
| tree | a1a7496d98f7f0066d500d383d15cddad2b78930 | |
| parent | af8f08d63862d686697555b3759c9125956e97e6 (diff) | |
| download | nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.tar nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.tar.gz nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.tar.bz2 nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.tar.lz nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.tar.xz nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.tar.zst nixlib-a76e28b54c6a9d7c6600e3e0259070257a018700.zip | |
chromium: Add dependency on pciutils for v25.
This fixes the build for latest development version 25. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index ec431108011c..7d41f72df207 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg , libpng, libxml2, libxslt , xdg_utils, yasm, zlib -, libusb1, libexif +, libusb1, libexif, pciutils , python, perl, pkgconfig , nspr, udev, krb5 @@ -84,9 +84,10 @@ let libusb1 libexif ]; - maybeFixPulseAudioBuild = let - post23 = !versionOlder sourceInfo.version "24.0.0.0"; - in optional (post23 && cfg.pulseaudio) (fetchurl { + post23 = !versionOlder sourceInfo.version "24.0.0.0"; + post24 = !versionOlder sourceInfo.version "25.0.0.0"; + + maybeFixPulseAudioBuild = optional (post23 && cfg.pulseaudio) (fetchurl { url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; }); @@ -116,7 +117,8 @@ in stdenv.mkDerivation rec { ++ optionals cfg.gnome [ gconf libgcrypt ] ++ optional cfg.selinux libselinux ++ optional cfg.cups libgcrypt - ++ optional cfg.pulseaudio pulseaudio; + ++ optional cfg.pulseaudio pulseaudio + ++ optional post24 pciutils; opensslPatches = optional cfg.openssl openssl.patches; |