From 07896ee61dba47bc57c4c3b3b819033dc0324a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 8 Aug 2022 08:27:06 +0200 Subject: Turris Omnia cross build now should work --- pkgs/libatsha204/default.nix | 3 +++ pkgs/libatsha204/multiple-definitions.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/libatsha204/multiple-definitions.patch (limited to 'pkgs/libatsha204') diff --git a/pkgs/libatsha204/default.nix b/pkgs/libatsha204/default.nix index 96a621d..10cd859 100644 --- a/pkgs/libatsha204/default.nix +++ b/pkgs/libatsha204/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; sha256 = "1lhvqdy2sfbvz9y9lwqhxggpr8rwfd66v73gv9s7b7811r6way20"; }; + patches = [ + ./multiple-definitions.patch + ]; buildInputs = [openssl unbound]; nativeBuildInputs = [pkg-config perl patchelf]; diff --git a/pkgs/libatsha204/multiple-definitions.patch b/pkgs/libatsha204/multiple-definitions.patch new file mode 100644 index 0000000..94dd5fc --- /dev/null +++ b/pkgs/libatsha204/multiple-definitions.patch @@ -0,0 +1,13 @@ +diff --git a/src/libatsha204/dnsmagic.c b/src/libatsha204/dnsmagic.c +index d5f82b4..dc0bb90 100644 +--- a/src/libatsha204/dnsmagic.c ++++ b/src/libatsha204/dnsmagic.c +@@ -42,7 +42,7 @@ + /* + * Global variable with configuration and some initial config values. + */ +-atsha_configuration g_config; ++extern atsha_configuration g_config; + + /* + * Get decimal number from its string representation -- cgit v1.2.3