Unverified Commit a3c24f95 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #216779 from viraptor/libtomcrypt-arm 

libtomcrypt,StormLib: fix darwin arm build
parents 042598f1 65b59774

pkgs/development/libraries/StormLib/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ stdenv.mkDerivation rec { 
    sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc";

  };



  # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin

  # upgrades to a newer SDK.

  NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks"

pkgs/development/libraries/libtomcrypt/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec { 
    sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn";

  };



  # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin

  # upgrades to a newer SDK.

  NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";



  patches = [

    (fetchpatch {

      name = "CVE-2019-17362.patch";