diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
| commit | aa9a04883e34f6a7b89846e87654577d5b218f46 (patch) | |
| tree | 5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/applications/virtualization/virtualbox/default.nix | |
| parent | 21f9180d49d1d911668620f3d8897c1e1352672a (diff) | |
| download | nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2 nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.zip | |
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ebdac411b113..df7b555e0487 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -97,14 +97,7 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch - ++ [ - (fetchurl rec { - name = "fix-detect-gcc-5.4.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=827193;filename=${name};msg=5"; - sha256 = "0y6v5dc6fqj9iv27cl8q2g87v1kxg19129mpas4vjg7g0529v4g9"; - }) - ]; + patches = optional enableHardening ./hardened.patch; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ |