diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3af9796136fb..e42917032111 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - version = "4.2.0"; + version = "4.2.2"; forEachModule = action: '' for mod in \ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6"; + sha256 = "943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700"; }; buildInputs = @@ -44,7 +44,9 @@ in stdenv.mkDerivation { ++ optional javaBindings jdk ++ optional pythonBindings python; - patchPhase = '' + patches = [ ./remove_fa_ir.patch ]; + + postPatch = '' 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/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch new file mode 100644 index 000000000000..0d7a83421927 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch @@ -0,0 +1,30 @@ +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 \