From ecc27744a86f53beb2067ac3e1b3bbc7cf482180 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 13:46:29 +0200 Subject: [PATCH] carla: remove gtk2 --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/applications/audio/carla/default.nix | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c1e01105f417..b12ca53b16fa 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -136,6 +136,8 @@ - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. +- `carla` no longer support `gtk2` override. + - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. - `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021. diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 779f3ba6815b..ece20404eac8 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, alsa-lib, file, fluidsynth, @@ -13,11 +12,9 @@ pkg-config, python3Packages, which, - gtk2 ? null, gtk3 ? null, qtbase ? null, withFrontend ? true, - withGtk2 ? true, withGtk3 ? true, withQt ? true, wrapQtAppsHook ? null, @@ -62,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { libsndfile ] ++ lib.optional withQt qtbase - ++ lib.optional withGtk2 gtk2 ++ lib.optional withGtk3 gtk3; propagatedBuildInputs = finalAttrs.pythonPath; @@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: { filename="$(basename -- "$file")" substituteInPlace "$file" --replace-fail '--with-appname="$0"' "--with-appname=\"$filename\"" done - '' - + lib.optionalString withGtk2 '' - # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge. - substituteInPlace source/bridges-ui/Makefile \ - --replace-fail '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0' ''; dontWrapQtApps = true;