mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 18:24:53 +00:00
libdbusmenu-gtk2: drop
libappindicator-gtk2 provides compatibility for GTK 2 applications, and is unused in Nixpkgs. since GTK 2 is long deprecated and being removed from Nixpkgs, we remove this as well.
This commit is contained in:
@@ -10,14 +10,13 @@
|
||||
json-glib,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
gtkVersion ? null,
|
||||
gtk2,
|
||||
withGtk3 ? false,
|
||||
gtk3,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}";
|
||||
pname = "libdbusmenu-${if withGtk3 then "gtk3" else "glib"}";
|
||||
version = "16.04.0";
|
||||
|
||||
src =
|
||||
@@ -41,13 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
dbus-glib
|
||||
json-glib
|
||||
]
|
||||
++
|
||||
lib.optional (gtkVersion != null)
|
||||
{
|
||||
"2" = gtk2;
|
||||
"3" = gtk3;
|
||||
}
|
||||
.${gtkVersion} or (throw "unknown GTK version ${gtkVersion}");
|
||||
++ lib.optional withGtk3 gtk3;
|
||||
|
||||
patches = [
|
||||
./requires-glib.patch
|
||||
@@ -70,11 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"CFLAGS=-Wno-error"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
# TODO use `lib.withFeatureAs`
|
||||
(if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}")
|
||||
(if withGtk3 then "--with-gtk=3" else "--disable-gtk")
|
||||
"--disable-dumper"
|
||||
"--disable-scrollkeeper"
|
||||
]
|
||||
++ lib.optional (gtkVersion != "2") "--disable-dumper";
|
||||
];
|
||||
|
||||
doCheck = false; # generates shebangs in check phase, too lazy to fix
|
||||
|
||||
@@ -98,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"dbusmenu-glib-0.4"
|
||||
"dbusmenu-jsonloader-0.4"
|
||||
]
|
||||
++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4";
|
||||
++ lib.optional withGtk3 "dbusmenu-gtk3-0.4";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.msteen ];
|
||||
};
|
||||
|
||||
@@ -1271,6 +1271,7 @@ mapAliases {
|
||||
libclc = throw "'libclc' has been removed, as no packages use it; reach out to LLVM/Mesa maintainers if you need this back."; # Added 2026-08-06
|
||||
libdbiDrivers = warnAlias "'libdbiDrivers' has been renamed to 'libdbi-drivers'" libdbi-drivers; # Added 2026-02-08
|
||||
libdbiDriversBase = warnAlias "'libdbiDriversBase' has been renamed to 'libdbi-drivers-base'" libdbi-drivers-base; # Added 2026-02-08
|
||||
libdbusmenu-gtk2 = throw "'libdbusmenu-gtk2' has been removed as it depended on the deprecated GTK 2 engine."; # Added 2026-08-10
|
||||
libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
|
||||
libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
|
||||
libdisplay-info_0_2 = throw "`libdisplay-info_0_2` has been removed as it is was unused in Nixpkgs. Consider upgrading to `libdisplay-info_0_3` or `libdisplay-info` instead"; # Added 2026-08-04
|
||||
|
||||
@@ -5950,8 +5950,7 @@ with pkgs;
|
||||
withSqlite = false;
|
||||
};
|
||||
|
||||
libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
|
||||
libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
|
||||
libdbusmenu-gtk3 = libdbusmenu.override { withGtk3 = true; };
|
||||
|
||||
libdisplay-info_0_3 = callPackage ../by-name/li/libdisplay-info/0.3.nix { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user