tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
libtomcrypt,StormLib: fix darwin arm build
Move the incorrect fix from StormLib to proper place in libtomcrypt.
+4
-4
-4
pkgs/development/libraries/StormLib/default.nix
-4
pkgs/development/libraries/StormLib/default.nix
···
11
11
sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc";
12
12
};
13
13
14
-
# Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin
15
-
# upgrades to a newer SDK.
16
-
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";
17
-
18
14
postPatch = ''
19
15
substituteInPlace CMakeLists.txt \
20
16
--replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks"
+4
pkgs/development/libraries/libtomcrypt/default.nix
+4
pkgs/development/libraries/libtomcrypt/default.nix
···
9
9
sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn";
10
10
};
11
11
12
+
# Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin
13
+
# upgrades to a newer SDK.
14
+
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";
15
+
12
16
patches = [
13
17
(fetchpatch {
14
18
name = "CVE-2019-17362.patch";