Commit graph

278 commits

Author SHA1 Message Date
aszlig 0f9a5eb027 virtualbox: Add symbol versions to all modules.
Copy all symbol versions from the ones generated in the vboxdrv build.
2012-08-19 09:02:16 +02:00
aszlig 1b8ec2eeec virtualbox: Don't build modules for guests.
We're the host so we don't need the kernel modules for the guest additions, as
they're build with in a separate derivation anyway.
2012-08-19 09:02:15 +02:00
aszlig 9fb1d2e6fc virtualbox: Remove redundant NIX_CFLAGS_COMPILE.
The "include/generated" stuff is already added to the search path by the kernel
modules build system, so no need to hack it in like this.
2012-08-19 09:02:15 +02:00
aszlig 3e62a02b17 virtualbox: Separate modules build and install.
First of all, modules won't install when there is no "make modules" prior to it,
so we're doing this now with a new function called forEachModule, so we can
avoid duplication as much as possible.

In addition this sets $sourcedir to the current directory of the configurePhase,
so we're able to find the source tree later on, after several chdir()s.
2012-08-19 09:02:15 +02:00
aszlig e32d7843da virtualbox: Set depmod path to /do_not_use_depmod.
The scripts/depmod.sh checks whether the path in $DEPMOD is executable and only
executes it if that's the case. So, by setting DEPMOD to "/do_not_use_depmod"
the destination path doesn't exist _and_ thus isn't executable aswell.
2012-08-19 09:02:15 +02:00
aszlig 31d8a9a1f4 virtualbox: Fix wrong path when recursing modules.
The for loop didn't find $curdir, because it was set _after_ the directory has
been changed. The variable is now called $srcroot and is set before the
installPhase is changing directories.
2012-08-19 09:02:15 +02:00
aszlig 830e9db5dd virtualbox: Use Linux's kbuild to build modules.
Don't rely on VirtualBox's in-tree build scripts to set include paths correctly
and use the official way of the Linux kernel to build the modules. That way we
don't need to make ugly symlinks in the kernel tree or heavily patch VirtualBox.
2012-08-19 09:02:14 +02:00
Eelco Dolstra c67c397c11 VirtualBox-GuestAdditions: Add to the channel 2012-08-14 13:43:37 -04:00
aszlig 8a5d9bad94 Update VirtualBox to version 4.1.18.
This should make #15 obsolete, as those patches were cherry-picked from
upstream.
2012-07-03 08:44:35 -04:00
Peter Simons 3ecf94ae27 Update VirtualBox and guest additions to v4.1.16.
This includes fixes for kernels up to v3.4, so we shouldn't get build failures
with kernel 3.4 anymore.

svn path=/nixpkgs/trunk/; revision=34438
2012-06-11 07:15:03 +00:00
Shea Levy f9a88de275 VirtualBox 4.1.12
svn path=/nixpkgs/trunk/; revision=33888
2012-04-23 04:25:18 +00:00
Shea Levy 5f01a1d8b6 Let virtualbox build on linux 3.3+
svn path=/nixpkgs/trunk/; revision=33498
2012-03-31 15:57:35 +00:00
Eelco Dolstra bd8d003d69 * VirtualBox updated to 4.1.10. Drop the wrapper script since it no
longer seems needed.  Optionally build the Python bindings.  Disable
  the Java bindings by default to prevent a gratuitous dependency on
  the JDK.

svn path=/nixpkgs/trunk/; revision=33295
2012-03-20 13:54:01 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Eelco Dolstra 000051b196 * VirtualBox: drop the unnecessary dependency on HAL.
svn path=/nixpkgs/trunk/; revision=32745
2012-03-02 14:54:14 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Eelco Dolstra 5f20423948 * Fix the VirtualBox build. It was broken since the Qt 4.8 update
because Qt 4.8 doesn't propagate dependencies such as "which" and
  "pkgconfig".  Thanks to Yury for pointing this out.
* Also updated VirtualBox to 4.1.8.

svn path=/nixpkgs/trunk/; revision=32527
2012-02-23 22:04:54 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Sander van der Burg a56033ea14 Bumped virtualbox version to 4.1.6
svn path=/nixpkgs/trunk/; revision=30637
2011-11-30 14:44:29 +00:00
Yury G. Kudryashov 9f1347ae7e virtualbox-4.1.2
svn path=/nixpkgs/trunk/; revision=29677
2011-10-05 19:54:44 +00:00
Marco Maggesi b7190d1e86 VirtualBox Guest Additions: install modules for Xorg version 1.9.x
svn path=/nixpkgs/trunk/; revision=28518
2011-08-12 14:27:28 +00:00
David Guibert 0ce8c08099 fix the compilation of virtualboxGuestaddition
svn path=/nixpkgs/trunk/; revision=28415
2011-08-09 09:07:29 +00:00
David Guibert 850748a6f3 update virtualbox guestadditions 4.1.0
svn path=/nixpkgs/trunk/; revision=28380
2011-08-08 12:11:57 +00:00
Shea Levy be1bd9e6bf virtualbox: Bump to 4.1.0
svn path=/nixpkgs/trunk/; revision=28207
2011-08-06 20:52:11 +00:00
Shea Levy 1235977c25 Bump virtualbox guest additions to 4.0.4
svn path=/nixpkgs/trunk/; revision=26884
2011-04-18 19:41:34 +00:00
Shea Levy bb0af0aa03 Bump virtualbox to 4.0.4
svn path=/nixpkgs/trunk/; revision=26883
2011-04-18 19:24:10 +00:00
David Guibert a45d06f7fb Merge commit 'f54c97b' into HEAD
svn path=/nixpkgs/trunk/; revision=25768
2011-02-02 20:05:47 +00:00
David Guibert ad3a08ef1c update virtualboxGuestAdditions to 4.0.2
svn path=/nixpkgs/trunk/; revision=25744
2011-02-02 06:54:57 +00:00
David Guibert 7544a6399f virtualbox: 3.2.10 -> 4.0.2
The upgrade is needed to compile virtualbox
with kernel 2.6.37.

svn path=/nixpkgs/trunk/; revision=25735
2011-01-31 09:42:48 +00:00
Evgeny Egorochkin 056394c0f2 VirtualBox: cleanup
svn path=/nixpkgs/trunk/; revision=25347
2011-01-02 19:37:13 +00:00
Evgeny Egorochkin dc16cd8995 VirtualBox: version bump and compilation fix.
svn path=/nixpkgs/trunk/; revision=25344
2011-01-02 18:43:27 +00:00
Evgeny Egorochkin b909a4ce76 Virtualbox guest additions: fix runtime dep on which. Patch by Rohan Hart.
svn path=/nixpkgs/trunk/; revision=24903
2010-11-28 10:14:07 +00:00
Evgeny Egorochkin 65b669feb8 VirtualBox: fix i686 compilation
svn path=/nixpkgs/trunk/; revision=24783
2010-11-20 10:41:53 +00:00
Sander van der Burg c6f26ed797 Bumped VirtualBox version to 3.2.8
svn path=/nixpkgs/trunk/; revision=24147
2010-10-07 15:14:15 +00:00
Sander van der Burg 8d1cc5fcc2 Upgraded VirtualBox guest additions to version 3.2.8 and fixed it to make it work with xorg-server-1.8.x again. The RandR support still doesn't work properly, however
svn path=/nixpkgs/trunk/; revision=23664
2010-09-07 12:08:24 +00:00
Eelco Dolstra a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix.
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
2010-08-06 10:34:34 +00:00
Sander van der Burg 953469729f Removed the VBoxRandR tool which does not exists anymore
svn path=/nixpkgs/trunk/; revision=21857
2010-05-19 11:10:15 +00:00
Sander van der Burg 202e36f856 Update VirtualBox + guest additions to version 3.1.8
svn path=/nixpkgs/trunk/; revision=21846
2010-05-18 19:10:28 +00:00
Sander van der Burg 903fff2bdd Fixed the download URL of virtualbox
svn path=/nixpkgs/trunk/; revision=20886
2010-03-31 09:49:58 +00:00
Sander van der Burg e09befd926 Upgraded virtualbox guest additions to 3.1.6
svn path=/nixpkgs/trunk/; revision=20884
2010-03-31 09:32:52 +00:00
Sander van der Burg 88a67817c9 Upgraded VirtualBox to 3.1.6
svn path=/nixpkgs/trunk/; revision=20883
2010-03-31 09:31:13 +00:00
Sander van der Burg 3b65d90edf Removed all root ownership stuff, so that the kernel modules will install in a chroot environment
svn path=/nixpkgs/trunk/; revision=20103
2010-02-18 14:04:22 +00:00
Sander van der Burg 2fb201871b Running the guest additions build in a chroot environment will not install the kernel modules. Removing the ownership attributes might prevents this
svn path=/nixpkgs/trunk/; revision=20097
2010-02-18 13:09:49 +00:00
Sander van der Burg b036ee727a Fixed installation of virtualbox kernel modules
svn path=/nixpkgs/trunk/; revision=20077
2010-02-17 16:13:53 +00:00
Sander van der Burg 30b6f037a0 Upgraded VirtualBox to 3.1.4 which also fixes problems in recent NixOS releases. It took me a while to upgrade this, since the installer is different compared to older releases.
svn path=/nixpkgs/trunk/; revision=20057
2010-02-16 16:10:01 +00:00
Sander van der Burg 1033f5e6fa Oops: forgot to change version number in the name
svn path=/nixpkgs/trunk/; revision=20034
2010-02-15 22:54:08 +00:00
Sander van der Burg 7b17fdc916 Upgraded VirtualBox to 3.1.4
svn path=/nixpkgs/trunk/; revision=19993
2010-02-14 21:27:13 +00:00
Sander van der Burg 6608d55291 Updated VirtualBox to version 3.1.2
svn path=/nixpkgs/trunk/; revision=19406
2010-01-13 16:14:22 +00:00
Sander van der Burg 307280e9e3 Reverted guest additions back to 3.0.10 since 3.1.0 has a new installer. I will look at this installer later
svn path=/nixpkgs/trunk/; revision=18760
2009-12-02 13:45:42 +00:00
Sander van der Burg 8681d7d695 Upgraded VirtualBox to version 3.1.0
svn path=/nixpkgs/trunk/; revision=18758
2009-12-02 13:31:56 +00:00
Sander van der Burg 866bbe32f2 Updated VirtualBox guest additions and changed some files to support Xorg 7.5
svn path=/nixpkgs/trunk/; revision=18199
2009-11-06 11:41:34 +00:00
Sander van der Burg ab55ac28b4 Upgraded VirtualBox to 3.0.10
svn path=/nixpkgs/trunk/; revision=18196
2009-11-06 11:31:28 +00:00
Sander van der Burg a7f52f8233 Fixed building of VirtualBox guest additions on x86-64
svn path=/nixpkgs/trunk/; revision=17806
2009-10-14 15:26:42 +00:00
Sander van der Burg 5417fb5b3b Added some x86-64 support to the VirtualBox guest additions
svn path=/nixpkgs/trunk/; revision=17798
2009-10-14 12:37:52 +00:00
Sander van der Burg 131c5f7e33 Added libXfixes to the rpath of VBoxClient, so that the shared host/guest clipboard will work
svn path=/nixpkgs/trunk/; revision=17789
2009-10-13 21:19:07 +00:00
Sander van der Burg 6351c10581 Moved vboxclient item to autostart
svn path=/nixpkgs/trunk/; revision=17782
2009-10-13 15:04:43 +00:00
Sander van der Burg 6cee2a18b3 Copy virtualbox HAL FDI file, so that the mouse cursor follows the host OS' cursor
svn path=/nixpkgs/trunk/; revision=17780
2009-10-13 14:29:38 +00:00
Sander van der Burg fef3041a74 Added VirtualBox guest additions package. Currently only builds on i686-linux
svn path=/nixpkgs/trunk/; revision=17778
2009-10-13 13:32:00 +00:00
Sander van der Burg 0f20924465 - Upgraded VirtualBox to 3.0.8
- Fixed location of the VirtualBox icon
- Removed qt3 as dependency of VirtualBox since it's obsolete since 3.0.x


svn path=/nixpkgs/trunk/; revision=17725
2009-10-08 12:57:05 +00:00
Michael Raskin d3813f4f6b Limit VirtualBox platforms to linux
svn path=/nixpkgs/trunk/; revision=17202
2009-09-16 14:56:53 +00:00
Sander van der Burg 687f931c12 Fixed path to the VirtualBox desktop file
svn path=/nixpkgs/trunk/; revision=17048
2009-09-11 12:43:35 +00:00
Sander van der Burg 32e16ca9c6 Upgraded VirtualBox to 3.0.6
svn path=/nixpkgs/trunk/; revision=17046
2009-09-11 12:24:32 +00:00
Rob Vermaas b4c3057f76 virtualbox 3.0.2
svn path=/nixpkgs/trunk/; revision=16474
2009-07-27 14:10:59 +00:00
Sander van der Burg ac3253387f Replaced awk command with absolute path
svn path=/nixpkgs/trunk/; revision=16087
2009-06-29 19:44:38 +00:00
Sander van der Burg da25b2498b Upgraded VirtualBox to 2.2.4
svn path=/nixpkgs/trunk/; revision=15803
2009-05-30 16:35:41 +00:00
Sander van der Burg a39c2a0e88 Added ALSA sound support to VirtualBox
svn path=/nixpkgs/trunk/; revision=15785
2009-05-29 11:39:24 +00:00
Sander van der Burg 1facdc08c1 Upgraded VirtualBox to version 2.2.2
svn path=/nixpkgs/trunk/; revision=15520
2009-05-09 21:15:28 +00:00
Eelco Dolstra 210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra fb6ccb6355 * Include the kernel version number in the Virtualbox name attribute
to disambiguate between the various Virtualbox builds.

svn path=/nixpkgs/trunk/; revision=15087
2009-04-16 13:44:06 +00:00
Sander van der Burg 93b2ffcf38 Removed all earlier virtualbox attempts, since they are obsolete now
svn path=/nixpkgs/trunk/; revision=15069
2009-04-15 14:34:02 +00:00
Sander van der Burg dd3608c0de Added patchelf instruction in order to compile virtualbox on x86-64
svn path=/nixpkgs/trunk/; revision=15063
2009-04-15 12:16:50 +00:00
Sander van der Burg 140a3d416f Added wrapper script and desktop item support to VirtualBox
svn path=/nixpkgs/trunk/; revision=15030
2009-04-14 13:29:19 +00:00
Sander van der Burg 34a1bb38ab Added Nix expression for VirtualBox 2.2.0 which also installs and compiles the kernel module
svn path=/nixpkgs/trunk/; revision=15003
2009-04-12 21:59:40 +00:00
Lluís Batlle i Rossell 09d68fcad2 First steps trying to build VirtualBox. I haven't finished.
I left before trying to install and run the files compiled.

svn path=/nixpkgs/trunk/; revision=13863
2009-01-25 20:09:17 +00:00
Michael Raskin 71f8e0911a Added src to meta for builderDefs-based packages.
svn path=/nixpkgs/trunk/; revision=10913
2008-03-02 18:49:31 +00:00
Michael Raskin bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs
svn path=/nixpkgs/trunk/; revision=10214
2008-01-18 12:36:56 +00:00
Michael Raskin fa272cab14 Fixed bridge-utils, added qemu, tuned builder-defs unpack, added xlaunch - a tool to launch X using everything possible from the job except slim.
svn path=/nixpkgs/trunk/; revision=9985
2007-12-31 08:49:41 +00:00