From adf29eeeb6dcaf35202850edda9128eae0563287 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 28 Dec 2024 10:54:38 -0700 Subject: [PATCH 1/2] tayga: fix building with gcc14 Sources for tayga haven't been updated since 2011, therefore it's probably more reasonable to disable these errors during compilation rather than patching. --- pkgs/by-name/ta/tayga/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix index f53491664732..4749fcee5042 100644 --- a/pkgs/by-name/ta/tayga/package.nix +++ b/pkgs/by-name/ta/tayga/package.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { hash = "sha256-Kx95J6nS3P+Qla/zwnGSSwUsz9L6ypWIsndDGkTwAJw="; }; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-address-of-packed-member" + "-Wno-implicit-function-declaration" + ]; + passthru.tests.tayga = nixosTests.tayga; meta = with lib; { From cc27227303863ecca0967b5ef39f7e93dbd8b4ab Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 28 Dec 2024 10:55:33 -0700 Subject: [PATCH 2/2] tayga: use finalAttrs style --- pkgs/by-name/ta/tayga/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix index 4749fcee5042..bc6052464938 100644 --- a/pkgs/by-name/ta/tayga/package.nix +++ b/pkgs/by-name/ta/tayga/package.nix @@ -5,12 +5,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.2"; pname = "tayga"; src = fetchurl { - url = "http://www.litech.org/${pname}/${pname}-${version}.tar.bz2"; + url = "http://www.litech.org/tayga/tayga-${finalAttrs.version}.tar.bz2"; hash = "sha256-Kx95J6nS3P+Qla/zwnGSSwUsz9L6ypWIsndDGkTwAJw="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "tayga"; }; -} +})