Skip to content

Commit

Permalink
zrythm: fix pyliblo build failure for carla
Browse files Browse the repository at this point in the history
bandithedoge committed Jan 9, 2025
1 parent b0cbba9 commit c7922a7
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 0 additions & 2 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
@@ -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;
17 changes: 14 additions & 3 deletions pkgs/zrythm/default.nix
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit c7922a7

Please sign in to comment.