swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

chromium: Add dependency on pciutils for v25.

Browse source 
This fixes the build for latest development version 25.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-11-20 04:49:49 +01:00
parent af8f08d638
commit a76e28b54c
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -5,7 +5,7 @@
, libevent, expat, libjpeg , libevent, expat, libjpeg
, libpng, libxml2, libxslt , libpng, libxml2, libxslt
, xdg_utils, yasm, zlib , xdg_utils, yasm, zlib
, libusb1, libexif , libusb1, libexif, pciutils
, python, perl, pkgconfig , python, perl, pkgconfig
, nspr, udev, krb5 , nspr, udev, krb5
@ -84,9 +84,10 @@ let
libusb1 libexif libusb1 libexif
]; ];
maybeFixPulseAudioBuild = let
post23 = !versionOlder sourceInfo.version "24.0.0.0"; post23 = !versionOlder sourceInfo.version "24.0.0.0";
in optional (post23 && cfg.pulseaudio) (fetchurl { 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; url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch;
sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb";
}); });
@ -116,7 +117,8 @@ in stdenv.mkDerivation rec {
++ optionals cfg.gnome [ gconf libgcrypt ] ++ optionals cfg.gnome [ gconf libgcrypt ]
++ optional cfg.selinux libselinux ++ optional cfg.selinux libselinux
++ optional cfg.cups libgcrypt ++ optional cfg.cups libgcrypt
++ optional cfg.pulseaudio pulseaudio; ++ optional cfg.pulseaudio pulseaudio
++ optional post24 pciutils;
opensslPatches = optional cfg.openssl openssl.patches; opensslPatches = optional cfg.openssl openssl.patches;