From 0a58c86f1e7750d21d9bed332b32c6df0ea39ce4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 13:19:10 +0200 Subject: [PATCH 1/2] deadbeef: remove gtk2 --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/applications/audio/deadbeef/default.nix | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c1e01105f417..a01cc7c3d245 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -144,6 +144,8 @@ and backwards incompatible database migrations. Ensure backups are valid and run a Full Scan after starting the new version. +- `deabbeef` no longer support `gtk2`. + - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project. - `fetchFromBitBucket` has gained a `fetchgit` backend when passing in git-related arguments similar to `fetchFromGitHub`. diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 28e55a7225cb..94e41e62d851 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -10,10 +10,6 @@ pkg-config, jansson, swift-corelibs-libdispatch, - # deadbeef can use either gtk2 or gtk3 - gtk2Support ? false, - gtk2, - gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook3, @@ -65,8 +61,6 @@ curl, }: -assert gtk2Support || gtk3Support; - let inherit (lib) optionals; @@ -87,11 +81,6 @@ clangStdenv.mkDerivation { buildInputs = [ jansson swift-corelibs-libdispatch - ] - ++ optionals gtk2Support [ - gtk2 - ] - ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] @@ -163,8 +152,6 @@ clangStdenv.mkDerivation { intltool libtool pkg-config - ] - ++ optionals gtk3Support [ wrapGAppsHook3 ]; From 0474967e0ef56bef6fc9ce8cddc61fb97628d48b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 13:24:34 +0200 Subject: [PATCH 2/2] deadbeef: cleanup --- pkgs/applications/audio/deadbeef/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 94e41e62d851..afcd574395f4 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -3,8 +3,7 @@ config, clangStdenv, fetchFromGitHub, - autoconf, - automake, + autoreconfHook, libtool, intltool, pkg-config, @@ -147,8 +146,7 @@ clangStdenv.mkDerivation { ]; nativeBuildInputs = [ - autoconf - automake + autoreconfHook intltool libtool pkg-config @@ -157,17 +155,6 @@ clangStdenv.mkDerivation { enableParallelBuilding = true; - preConfigure = '' - ./autogen.sh - ''; - - postPatch = '' - # Fix the build on c++17 compiler: - # https://github.com/DeaDBeeF-Player/deadbeef/issues/3012 - # TODO: remove after 1.9.5 release. - substituteInPlace plugins/adplug/Makefile.am --replace 'adplug_la_CXXFLAGS = ' 'adplug_la_CXXFLAGS = -std=c++11 ' - ''; - meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; mainProgram = "deadbeef";