diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30234c92f6b..62a4c6cc211 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -79,10 +79,8 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; - maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl { - url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; - sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; - }); + maybeFixPulseAudioBuild = optional (post23 && pulseSupport) + ./pulse_audio_fix.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -197,7 +195,7 @@ in stdenv.mkDerivation rec { meta = { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow ]; + maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch new file mode 100644 index 00000000000..01ff89a9a63 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch @@ -0,0 +1,11 @@ +--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700 ++++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700 +@@ -86,7 +86,7 @@ + + // All channel maps have the same size array of channel positions. + for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) { +- int channel_position = kChannelOrderings[channel_layout][channel]; ++ int channel_position = ChannelOrder(channel_layout, static_cast(channel)); + if (channel_position > -1) { + channel_map.map[channel_position] = ChromiumToPAChannelPosition( + static_cast(channel)); diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 87eb0020c1d..f699119c5f0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel +, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 , which, alsaLib, curl, gawk , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null @@ -11,8 +11,8 @@ with stdenv.lib; let - version = "4.2.4"; - extpackRevision = "81684"; + version = "4.2.6"; + extpackRevision = "82870"; forEachModule = action: '' for mod in \ @@ -35,7 +35,7 @@ let name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}" + ".vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed"; + sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582"; url = "https://www.virtualbox.org/wiki/Downloads"; }; @@ -44,19 +44,17 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc"; + sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3"; }; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL - libcap glib kernel python alsaLib curl pam xorriso makeself perl + libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk ++ optional pythonBindings python; - patches = [ ./remove_fa_ir.patch ]; - - postPatch = '' + prePatch = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9483868bc5e..7a79a73c6b9 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -2,14 +2,14 @@ , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor , dbus }: -let version = "4.2.4"; in +let version = "4.2.6"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9"; + sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch deleted file mode 100644 index 0d7a8342192..00000000000 --- a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch is for VirtualBox-4.2.2, to temporarily remove references to the -fa_IR language file from the source tree, as it somehow got lost during tarball -creation. For more information on this subject please have a look at: - -https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html - -diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro -index ffeb410..37ac56a 100644 ---- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro -+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro -@@ -63,7 +63,6 @@ TRANSLATIONS = \ - nls/VirtualBox_es.ts \ - nls/VirtualBox_eu.ts \ - nls/VirtualBox_fi.ts \ -- nls/VirtualBox_fa_IR.ts \ - nls/VirtualBox_fr.ts \ - nls/VirtualBox_gl_ES.ts \ - nls/VirtualBox_hu.ts \ -diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -index 66f0ec3..2fc19b9 100644 ---- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \ - de \ - en \ - es \ -- fa_IR \ - hu \ - it \ - ja \ diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b065a50ce00..bff4ffa3b19 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -10,6 +10,7 @@ andres = "Andres Loeh "; antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; + aszlig = "aszlig "; bbenoist = "Baptist BENOIST "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index e92b7f8003d..876daa7a1ec 100644 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto +, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman , utilmacros , libdrm , pkgconfig }: @@ -21,12 +21,14 @@ stdenv.mkDerivation { autoconf automake libtool - xorgserver xproto fontsproto xf86driproto renderproto videoproto + xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman utilmacros libdrm pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + preConfigure = "autoreconf -vfi"; meta = {