From 151cd9e6e64181fe3423db5e4d5d3659b5802a6d Mon Sep 17 00:00:00 2001 From: IC Rainbow Date: Mon, 16 Dec 2024 11:12:21 +0200 Subject: [PATCH] target correct override --- flake.nix | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 342b99f04e..28e2dd813e 100644 --- a/flake.nix +++ b/flake.nix @@ -337,7 +337,10 @@ packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-android-log.patch ]; - packages."jpeg-turbo".flags.static = true; + packages.jpeg-turbo.flags.static-gcc = true; + packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [ + (pkgs.libjpeg_turbo.override { enableStatic = true; }) + ]; packages.simplexmq.flags.client_library = true; packages.simplexmq.components.library.libs = pkgs.lib.mkForce [ (android32Pkgs.openssl.override { static = true; enableKTLS = false; }) @@ -449,9 +452,9 @@ packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-android-log.patch ]; - packages.jpeg-turbo.flags.static = true; + packages.jpeg-turbo.flags.static-gcc = true; packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [ - (androidPkgs.libjpeg_turbo.override { enableStatic = true; }) + (pkgs.libjpeg_turbo.override { enableStatic = true; }) ]; packages.simplexmq.flags.client_library = true; @@ -561,7 +564,10 @@ packages.simplexmq.flags.swift = true; packages.direct-sqlcipher.flags.commoncrypto = true; packages.entropy.flags.DoNotGetEntropy = true; - packages."jpeg-turbo".flags.static = true; + packages.jpeg-turbo.flags.static = true; + packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [ + (pkgs.libjpeg_turbo.override { enableStatic = true; }) + ]; packages.simplexmq.flags.client_library = true; packages.simplexmq.components.library.libs = pkgs.lib.mkForce [ # TODO: have a cross override for iOS, that sets this. @@ -577,7 +583,10 @@ extra-modules = [{ packages.direct-sqlcipher.flags.commoncrypto = true; packages.entropy.flags.DoNotGetEntropy = true; - packages."jpeg-turbo".flags.static = true; + packages.jpeg-turbo.flags.static = true; + packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [ + (pkgs.libjpeg_turbo.override { enableStatic = true; }) + ]; packages.simplexmq.flags.client_library = true; packages.simplexmq.components.library.libs = pkgs.lib.mkForce [ ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;})) @@ -596,7 +605,10 @@ packages.simplexmq.flags.swift = true; packages.direct-sqlcipher.flags.commoncrypto = true; packages.entropy.flags.DoNotGetEntropy = true; - packages."jpeg-turbo".flags.static = true; + packages.jpeg-turbo.flags.static = true; + packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [ + (pkgs.libjpeg_turbo.override { enableStatic = true; }) + ]; packages.simplexmq.flags.client_library = true; packages.simplexmq.components.library.libs = pkgs.lib.mkForce [ (pkgs.openssl.override { static = true; }) @@ -611,7 +623,10 @@ extra-modules = [{ packages.direct-sqlcipher.flags.commoncrypto = true; packages.entropy.flags.DoNotGetEntropy = true; - packages."jpeg-turbo".flags.static = true; + packages.jpeg-turbo.flags.static = true; + packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [ + (pkgs.libjpeg_turbo.override { enableStatic = true; }) + ]; packages.simplexmq.flags.client_library = true; packages.simplexmq.components.library.libs = pkgs.lib.mkForce [ (pkgs.openssl.override { static = true; })