diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 13:57:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 18:02:19 +0200 |
| commit | ddd41a509a11cbed86f10a747b0b51a35d0b71ae (patch) | |
| tree | 8716fd6498681f4e012f74a610fbb0a781b442f3 /pkgs/applications | |
| parent | 3143f39e5aabcd27f1674a22af17888f8493e1bf (diff) | |
| download | nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.tar nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.tar.gz nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.tar.bz2 nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.tar.lz nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.tar.xz nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.tar.zst nixlib-ddd41a509a11cbed86f10a747b0b51a35d0b71ae.zip | |
virtualbox: Drop dontPatchELF hack
However, this also requires ad8f31df7f2e85edeb22809ada0949f9f72a7bfd to get rid of gcc_multi.out in the closure.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index baf18c3f66f4..ef834897022d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -9,6 +9,7 @@ , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false +, patchelfUnstable # needed until 0.10 is released }: with stdenv.lib; @@ -48,7 +49,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu libpng ] + pkgconfig which libXmu libpng patchelfUnstable ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport libpulseaudio @@ -181,9 +182,6 @@ in stdenv.mkDerivation { passthru = { inherit version; /* for guest additions */ }; - # Workaround for https://github.com/NixOS/patchelf/issues/93 (can be removed once this issue is addressed) - dontPatchELF = true; - meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; |