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

OVMF: fix build

Browse Source 
$fd for the output was overwritten during the build
This commit is contained in:
Robin Gloster 2017-05-29 12:20:05 +02:00
parent c63339567b
commit 13f2f8673b
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/virtualization/OVMF/default.nix
View File

@ -23,6 +23,9 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
hardeningDisable = [ "stackprotector" "pic" "fortify" ]; hardeningDisable = [ "stackprotector" "pic" "fortify" ];
unpackPhase = '' unpackPhase = ''
# $fd is overwritten during the build
export OUTPUT_FD=$fd
for file in \ for file in \
"${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
do do
@ -51,8 +54,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
''; '';
postFixup = '' postFixup = ''
mkdir -p $fd/FV mkdir -vp $OUTPUT_FD/FV
mv $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
''; '';
dontPatchELF = true; dontPatchELF = true;

4
pkgs/games/wesnoth/dev.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wesnoth"; pname = "wesnoth";
version = "1.13.6"; version = "1.13.8";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1"; sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];