From c7922a7b2d60fb8d1978b8806c5038d5ce96c264 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Thu, 9 Jan 2025 20:26:55 +0100 Subject: [PATCH] zrythm: fix pyliblo build failure for carla --- pkgs/default.nix | 2 -- pkgs/zrythm/default.nix | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index b7193fe2..5c642329 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -23,7 +23,6 @@ bitdos-bin = callPackage' ./bitdos-bin; blepfx = callPackages' ./blepfx; blocks = callPackage' ./blocks; - camomile-bin = callPackage' ./camomile-bin; cantata = callPackage' ./cantata; cardinal = callPackage' ./cardinal; charlatan = callPackage' ./charlatan; @@ -56,7 +55,6 @@ keepmenu = callPackage' ./keepmenu; kiwmi = callPackage' ./kiwmi; lamb = callPackage' ./lamb; - lira-8-bin = callPackage' ./lira-8-bin; luaPackages = callPackages' ./luaPackages; luakit = callPackage' ./luakit; lv2vst = callPackage' ./lv2vst; diff --git a/pkgs/zrythm/default.nix b/pkgs/zrythm/default.nix index 8921844d..78ad9b07 100644 --- a/pkgs/zrythm/default.nix +++ b/pkgs/zrythm/default.nix @@ -4,9 +4,20 @@ ... }: let # remove when 2.6.0 gets added to nixpkgs - carla = pkgs.carla.overrideAttrs (_: { - inherit (sources.carla-git) version src; - }); + carla = + (pkgs.carla.overrideAttrs (_: { + inherit (sources.carla-git) version src; + })) + .override { + python3Packages = pkgs.python3Packages.override { + overrides = final: prev: { + # remove when https://nixpk.gs/pr-tracker.html?pr=370735 makes it to nixpkgs-unstable + pyliblo = prev.pyliblo.overrideAttrs (_: { + NIX_CFLAGS_COMPILE = ["-Wno-incompatible-pointer-types"]; + }); + }; + }; + }; in pkgs.stdenv.mkDerivation rec { inherit (sources.zrythm) pname src;