diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
| commit | 3afa2460386b1472128e302d1db13dba54e68e12 (patch) | |
| tree | 1bc0a79319449f29cbd5a1715c0135db1bed9337 /pkgs/applications/virtualization | |
| parent | d9036a02b5c5ef31e18e913ce7e2eb56999d311e (diff) | |
| parent | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (diff) | |
| download | nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.gz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.bz2 nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.lz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.xz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.zst nixlib-3afa2460386b1472128e302d1db13dba54e68e12.zip | |
Merge branch 'staging'
This includes a security update of expat.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index df7b555e0487..ebdac411b113 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -97,7 +97,14 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch; + 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"; + }) + ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ |