nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 02:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #216779 from viraptor/libtomcrypt-arm

Browse Source 
libtomcrypt,StormLib: fix darwin arm build
This commit is contained in:
Aaron Andersen 2023-02-18 22:10:35 -05:00 committed by GitHub
commit a3c24f9535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/StormLib/default.nix
View File

@ -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"

4
pkgs/development/libraries/libtomcrypt/default.nix
View File

@ -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";