From 33006071769a9a04f3bfb6286977cc92799b4707 Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Sat, 29 Dec 2012 17:46:53 -1000 Subject: [PATCH 01/10] Upgrade VirtualBox Guest Additions to 4.2.6 --- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9483868bc5e3..7a79a73c6b95 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"; From 260cdd582e993d8985a28374233f82416eb06b07 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 9 Jan 2013 18:11:20 +0100 Subject: [PATCH 02/10] xfce4-notifyd: add new package --- .../xfce-4.8/applications/xfce4-notifyd.nix | 18 ++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix new file mode 100644 index 000000000000..598e6eb414d1 --- /dev/null +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }: + +stdenv.mkDerivation rec { + name = "xfce4-notifyd-0.2.2"; + + src = fetchurl { + url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2"; + sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; + }; + + buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ]; + + meta = { + homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd; + description = "The Xfce Notify Daemon"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index c20e42d20196..bfe7fddd7381 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -73,6 +73,8 @@ rec { ristretto = callPackage ./applications/ristretto.nix { }; + xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { }; + xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { }; xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; From acb6290eedf30a800a7aed64a2ad626d132c244f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 02:21:02 +0100 Subject: [PATCH 03/10] virtualbox: Update to new upstream version 4.2.6. Fortunately this time the upstream package was packaged correctly and we no longer need the patch to remove the reference to the fa_IR locale. In addition we need to add lvm2 to dependencies because VirtualBox now requires libdevmapper with its default configuration. We could disable it but in order to gain DM support I think it's necessary and at least could avoid some confusion from users if it's not working "out of the box" :-) This is a bugfix release, upstream changes are: * VMM: don't inject stale VT-x events to prevent crashes after VM reset * VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs * GUI: fixed trimming of anti-aliased text in details-view element headers * GUI: fixed create-settings-file-alias functionality on Mac hosts * GUI: fixed take-guest-screenshot functionality on Windows hosts * GUI: several minor fixes, including palette fixes * GUI: fixed Windows 2012 OS type * GUI: allow to terminate the VM even if VBoxSVC crashed * API: fixed cancelling of snapshots, previously this could lead to inconsistent VM configs * API: fixed identifying disk images by UUID * 3D Support: several fixes * VRDP: fixed occasional crash with external authentication * VGA: fix for double scan text modes * USB: fixed invalid pending request count at the time of service of DEVICE POWER requests (Windows hosts only) * USB keyboard: Korean keyboard workaround * Storage: fixed hang with QCOW images and asynchronous I/O enabled * Storage: fixed hang with newer VHD images * Storage: actually write the non-rotational flag to the VM settings (4.2.0 regression) * Virtio-net: fixed the problem with network statistics counters in Session Information dialog (GUI) * Metrics: introduced network rate and disk usage metrics * Metrics: fixed a crash under certain conditions on Solaris hosts * BIOS: fix for El Torito * Shared Folders: if the host folder of a shared folder mapping does not exist, keep it active but mark it as invalid to prevent inconsistent saved states * VBoxManage: fixed converting disks from raw images * VBoxManage: show snapshot description in the VM or snapshot information * VBoxManage: make implicit opening of media consistent in all places dealing with media * VBoxManage: the iSCSI initiator name was not stored in the settings file when doing storageattach * VBoxManage: metrics collect now properly handles 'CPU/MHz' and 'Net/*/LinkSpeed' metrics * VBoxManage: changing the image UUID or parent UUID as part of storageattach works now in all safe cases * VBoxManage: introduced storageattach --medium additions as a shortcut to mount the additions image * OVF: fixed importing OVF files cerated by recent VMware products * Linux hosts / Bridged Networking: fixed the problem with leaking connections in conntrack * Linux Additions: added support for ConsoleKit sessions in the vminfo service of VBoxService * Linux Additions: don't crash during remount under certain conditions * Linux/Solaris Additions: fixed guest memory metrics collection * Solaris hosts: added a dependency to ensure that the user directories are reachable when starting VBox services * Windows host installer: integrated user-contributed translations, thanks to all contributors! * Windows Additions: fixed auto-logon installation for Windows 8 * Windows Additions: don't fail if the shared folders host service is not available * Windows Additions: fixed Guest Additions startup on Windows 2000 guests * Windows Additions: auto-resize fixes for Windows 8 guests Upstream changelist with bug ids can be found here: https://www.virtualbox.org/wiki/Changelog Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 16 +++++----- .../virtualbox/remove_fa_ir.patch | 30 ------------------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 87eb0020c1df..f699119c5f04 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/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch deleted file mode 100644 index 0d7a83421927..000000000000 --- 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 \ From e2a429584406a9e233493c032a6068ca1e3fa450 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:10:40 +0100 Subject: [PATCH 04/10] chromium: Add pulse_audio_fix.patch to nixpkgs. The patch previously was fetched from an Arch Linux contributor but is no longer available there anymore. So, this is only an intermediate fix until channels get updated (very soon I hope, even though chromium 25 could get quite messy). Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 6 ++---- .../browsers/chromium/pulse_audio_fix.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30234c92f6b1..44c283cc75fa 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}"; 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 000000000000..01ff89a9a63b --- /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)); From 86f293a1e50f0a46adff8a3d3265229b02bf81ff Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:18:05 +0100 Subject: [PATCH 05/10] xf86-video-nouveau: Add pixman to buildInputs. Well, either this build is only broken on my system or noone actually uses nouveau? Even when looking into the source tree it seems to require pixman, so I suppose it didn't work for anyone prior to this commit. Signed-off-by: aszlig --- pkgs/os-specific/linux/xf86-video-nouveau/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index e92b7f8003d8..876daa7a1ecb 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 = { From abe2993c4bef1ecde7cb2d0ed29049eee181c812 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:22:45 +0100 Subject: [PATCH 06/10] chromium: Add myself to maintainers. Might come in handy to actually know when things going to break. In case you're wondering: Yes, "aszlig" is the name everyone uses in real life (even my family uses it) and is my pending stage name (not _yet_ officially). Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/lib/maintainers.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 44c283cc75fa..62a4c6cc211a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -195,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/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b065a50ce004..bff4ffa3b196 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 "; From 7242b4994e98a0d88b17eb40e7393bb8340bf0e3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Jan 2013 13:39:24 +0100 Subject: [PATCH 07/10] Added optparse: A node.js option parsing library --- pkgs/top-level/node-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 907f747ef7e2..791eb43358ca 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -742,6 +742,19 @@ let self = { ]; }; + "optparse" = self."optparse-1.0.3"; + + "optparse-1.0.3" = self.buildNodePackage rec { + name = "optparse-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/optparse/-/${name}.tgz"; + sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883"; + }; + deps = [ + + ]; + }; + "osenv" = self."osenv-0"; "osenv-0" = self.buildNodePackage rec { From 7e1d0c12a3e9e8cc2d4a78ba9a6039c20f3eca32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Jan 2013 15:10:27 +0100 Subject: [PATCH 08/10] stuntrally: updating from 1.4 to 1.8 I updated ogre and mygui, too. Now myguiSvn is older than mygui. We should check if this commit breaks other games that use ogre (ror?) --- pkgs/development/libraries/mygui/default.nix | 10 +++--- pkgs/development/libraries/ogre/default.nix | 6 ++-- pkgs/games/stuntrally/default.nix | 32 +++++++++++++++----- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index f692c14a6df1..0a2df0003847 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}: +{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}: stdenv.mkDerivation rec { - name = "mygui-3.0.1"; + name = "mygui-3.2.0"; src = fetchurl { - url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip; - sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig"; + url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip; + sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p"; }; enableParallelBuilding = true; - buildInputs = [ unzip ogre cmake ois freetype libuuid boost ]; + buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ]; meta = { homepage = http://mygui.info/; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 3a8e1c4ae556..6bb1916ed0fb 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -8,11 +8,11 @@ , nvidia_cg_toolkit }: stdenv.mkDerivation { - name = "ogre-1.7.2"; + name = "ogre-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2"; - sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5"; + url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2"; + sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s"; }; cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 69609b1bbfb4..31fd25a5150f 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,15 +1,33 @@ -{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig -, makeWrapper }: +{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig +, makeWrapper, enet, libXcursor }: stdenv.mkDerivation rec { - name = "stunt-rally-1.4"; + name = "stunt-rally-1.8"; - src = fetchurl { - url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2; - sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; + src = fetchgit { + url = git://github.com/stuntrally/stuntrally.git; + rev = "refs/tags/1.8"; + sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm"; }; - buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ]; + tracks = fetchgit { + url = git://github.com/stuntrally/tracks.git; + rev = "refs/tags/1.8"; + sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l"; + }; + + patchPhase = '' + sed -i 's/materials/materials material_templates/' data/CMakeLists.txt + ''; + + preConfigure = '' + mkdir data/tracks + cp -R $tracks/* data/tracks + ''; + + buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet + libXcursor + ]; # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but # the cmake code I saw is not ready for that. Therefore, we use the env var. From ce705aa9982a402ad88d9c07f3e455d0a57848d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Jan 2013 20:55:46 +0100 Subject: [PATCH 09/10] supertuxkart: updating to 0.8 --- pkgs/games/super-tux-kart/default.nix | 23 +++++++++++++---------- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 0c92ffbcdbb1..46f22d332ccb 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,24 +1,27 @@ -{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa -, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig -, fribidi }: +{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa +, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig +, fribidi, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "supertuxkart-0.7.3"; + name = "supertuxkart-0.8"; src = fetchurl { url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7"; + sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr"; }; buildInputs = [ - plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843 - libXxf86vm curl pkgconfig fribidi + plib SDL openal freealut mesa libvorbis libogg gettext + libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake ]; - configureFlags = [ "--with-irrlicht=${irrlicht3843}" ]; + enableParallelBuilding = true; - postInstall = '' - mv $out/games $out/bin + preConfigure = '' + echo Building internal Irrlicht + cd lib/irrlicht/source/Irrlicht/ + NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + cd - ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bf3e136a59..7a820350dc9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8374,12 +8374,7 @@ let superTux = callPackage ../games/super-tux { }; - superTuxKart = callPackage ../games/super-tux-kart { - /* With GNU Make 3.82, the build process is stuck in the `data' - directory, after displaying "Making all in tracks", and `pstree' - indicates that `make' doesn't launch any new process. */ - stdenv = overrideInStdenv stdenv [ gnumake381 ]; - }; + superTuxKart = callPackage ../games/super-tux-kart { }; tbe = callPackage ../games/the-butterfly-effect {}; From 6f1aad769f4dab42e9542c079fa43184388b074f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Jan 2013 22:34:05 +0100 Subject: [PATCH 10/10] Libertine fonts: update and cleanup. --- pkgs/data/fonts/libertine/default.nix | 21 ++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index a0ed5f757974..514690cb0cd2 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,25 +1,24 @@ -args : with args; -rec { +args: with args; rec { + name = "linux-libertine-5.3.0"; + src = fetchurl { - url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz; - sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg"; + url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - buildInputs = [fontforge]; - configureFlags = []; + buildInputs = [ fontforge ]; /* doConfigure should be specified separately */ phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"]; - + extraFontForgeCommands = '' ScaleToEm(1000); ''; - doUnpack = fullDepEntry '' - tar xf ${src} - '' ["minInit"]; + doUnpack = lib.fullDepEntry '' + tar xf ${src} + '' ["minInit"]; - name = "linux-libertine-5.0.0"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a820350dc9b..b59a8a63deae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6519,7 +6519,7 @@ let liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { - inherit fontforge; + inherit fetchurl fontforge lib; }; lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};