public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

Browse Source 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
This commit is contained in:
William A. Kennington III
2015-11-14 12:32:51 -08:00
parent e4feccce81
commit 6602f49495
42 changed files with 579 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/syslinux/default.nix
View File

@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6";
};
# gcc5-fix should be in 6.04+, so remove if it fails to apply.
patches = [ ./perl-deps.patch ./gcc5-fix.patch ];
patches = [ ./perl-deps.patch ];
buildInputs = [ nasm perl libuuid ];