commit 13f2f8673b184599e7a65df422c968730554820f · pyrox.dev/nixpkgs

+5 -2

pkgs/applications/virtualization/OVMF/default.nix

···

       23
       23
        
         hardeningDisable = [ "stackprotector" "pic" "fortify" ];

     

       24
       24
        
       

     

       25
       25
        
         unpackPhase = ''

     

       26
       26
       +
           # $fd is overwritten during the build

     

       27
       27
       +
           export OUTPUT_FD=$fd

     

       28
       28
       +
       

     

       26
       29
        
           for file in \

     

       27
       30
        
             "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};

     

       28
       31
        
           do

     
···

       51
       54
        
           '';

     

       52
       55
        
       

     

       53
       56
        
         postFixup = ''

     

       54
       54
       -
           mkdir -p $fd/FV

     

       55
       55
       -
           mv $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV

     

       57
       57
       +
           mkdir -vp $OUTPUT_FD/FV

     

       58
       58
       +
           mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV

     

       56
       59
        
         '';

     

       57
       60
        
       

     

       58
       61
        
         dontPatchELF = true;

+2 -2

pkgs/games/wesnoth/dev.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "wesnoth";

     

       8
       8
       -
         version = "1.13.6";

     

       8
       8
       +
         version = "1.13.8";

     

       9
       9
        
       

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";

     

       14
       14
       -
           sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1";

     

       14
       14
       +
           sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ cmake pkgconfig ];