diff options
| author | Robin Gloster <mail@glob.in> | 2017-05-29 12:20:05 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-05-29 12:21:17 +0200 |
| commit | 13f2f8673b184599e7a65df422c968730554820f (patch) | |
| tree | 31b7051325755f9b8d1be5948f992e1e980d6774 /pkgs | |
| parent | c63339567bb2097b2b851f0a00e73e964b270d7e (diff) | |
| download | nixpkgs-13f2f8673b184599e7a65df422c968730554820f.tar nixpkgs-13f2f8673b184599e7a65df422c968730554820f.tar.gz nixpkgs-13f2f8673b184599e7a65df422c968730554820f.tar.bz2 nixpkgs-13f2f8673b184599e7a65df422c968730554820f.tar.lz nixpkgs-13f2f8673b184599e7a65df422c968730554820f.tar.xz nixpkgs-13f2f8673b184599e7a65df422c968730554820f.tar.zst nixpkgs-13f2f8673b184599e7a65df422c968730554820f.zip | |
OVMF: fix build
$fd for the output was overwritten during the build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/OVMF/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/wesnoth/dev.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 4f7ea37ca18..121875a69de 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { hardeningDisable = [ "stackprotector" "pic" "fortify" ]; unpackPhase = '' + # $fd is overwritten during the build + export OUTPUT_FD=$fd + for file in \ "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; do @@ -51,8 +54,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { ''; postFixup = '' - mkdir -p $fd/FV - mv $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV + mkdir -vp $OUTPUT_FD/FV + mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV ''; dontPatchELF = true; diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 0b335812ff0..315f9ea7a5e 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.6"; + version = "1.13.8"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1"; + sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr"; }; nativeBuildInputs = [ cmake pkgconfig ]; |