From c8455b4ae6a6481524a4abc46a766458f3ea2c01 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 12 Nov 2023 19:55:55 +0000 Subject: [PATCH] xtuner: pull upstream fix for glibc-2.38 Without the change build fails as https://hydra.nixos.org/log/7lwi8gmrwnlgvhdb7d5i4d5pspb6c1bs-xtuner-1.0.drv ../xputty/xfilepicker.c:194:5: error: format not a string literal and no format arguments [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wformat-security-Werror=format-security8;;] ZHF: https://github.com/NixOS/nixpkgs/issues/265948 --- pkgs/applications/audio/xtuner/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/applications/audio/xtuner/default.nix index c51852179114..1fdb97f6dad4 100644 --- a/pkgs/applications/audio/xtuner/default.nix +++ b/pkgs/applications/audio/xtuner/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cairo , libX11 @@ -22,6 +23,17 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Fix build against glibc-2.38. + (fetchpatch { + name = "glibc-2.38.patch"; + url = "https://github.com/brummer10/libxputty/commit/7eb70bf3f7bce0af9e1919d6c875cdb8efca734e.patch"; + hash = "sha256-VspR0KJjBt4WOrnlo7rHw1oAYM1d2RSz6JhuAEfsO3M="; + stripLen = 1; + extraPrefix = "libxputty/"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo libX11 libjack2 liblo libsigcxx zita-resampler fftwFloat ];