deadbeef: remove gtk2, cleanup (#451307)
This commit is contained in:
@@ -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`.
|
||||
|
||||
@@ -3,17 +3,12 @@
|
||||
config,
|
||||
clangStdenv,
|
||||
fetchFromGitHub,
|
||||
autoconf,
|
||||
automake,
|
||||
autoreconfHook,
|
||||
libtool,
|
||||
intltool,
|
||||
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 +60,6 @@
|
||||
curl,
|
||||
}:
|
||||
|
||||
assert gtk2Support || gtk3Support;
|
||||
|
||||
let
|
||||
inherit (lib) optionals;
|
||||
|
||||
@@ -87,11 +80,6 @@ clangStdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
jansson
|
||||
swift-corelibs-libdispatch
|
||||
]
|
||||
++ optionals gtk2Support [
|
||||
gtk2
|
||||
]
|
||||
++ optionals gtk3Support [
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
]
|
||||
@@ -158,29 +146,15 @@ clangStdenv.mkDerivation {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
autoreconfHook
|
||||
intltool
|
||||
libtool
|
||||
pkg-config
|
||||
]
|
||||
++ optionals gtk3Support [
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
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";
|
||||
|
||||
Reference in New Issue
Block a user