summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <ajs124@users.noreply.github.com>2022-06-15 16:21:36 +0200
committerGitHub <noreply@github.com>2022-06-15 16:21:36 +0200
commit6b622041e81c2a50f7ff5a685d06d44c0df87962 (patch)
treedde880c304eea39643b8bcfae1bfe057426bcdc4
parentf554c3e0f148ce37a1f636b7754407be3e5bb4a8 (diff)
parent8c3222d8357d5a9cdc4f8b2b7d4f2c4b89fa55a8 (diff)
downloadnixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.tar
nixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.tar.gz
nixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.tar.bz2
nixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.tar.lz
nixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.tar.xz
nixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.tar.zst
nixpkgs-6b622041e81c2a50f7ff5a685d06d44c0df87962.zip
Merge pull request #177633 from klemensn/libdbusmenus-qt4-remove
libdbusmenu_qt: Remove (Qt4 version)
-rw-r--r--pkgs/development/libraries/libdbusmenu-qt/default.nix31
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 1 insertions, 33 deletions
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
deleted file mode 100644
index 75d4f76b31f..00000000000
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl, qt4, cmake }:
-
-let
-  baseName = "libdbusmenu-qt";
-  v = "0.9.2";
-  homepage = "https://launchpad.net/${baseName}";
-  name = "${baseName}-${v}";
-in
-
-stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f";
-  };
-
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [ "-DWITH_DOC=OFF" ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "Provides a Qt implementation of the DBusMenu spec";
-    inherit homepage;
-    inherit (qt4.meta) platforms;
-    license = licenses.lgpl2;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 139a6d8217f..293c84692be 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -691,6 +691,7 @@ mapAliases ({
   libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore"; # Added 2021-05-16
   libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04
   libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22
+  libdbusmenu_qt = throw "'libdbusmenu_qt' (Qt4) is deprecated and unused, use 'libsForQt5.libdbusmenu'"; # Added 2022-06-14
   libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22
   libdigidoc = throw "'libdigidoc' is unused in nixpkgs, deprecated and archived by upstream, use 'libdigidocpp' instead"; # Added 2022-06-03
   liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc6c615b0b8..73d6ef850cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18451,8 +18451,6 @@ with pkgs;
   libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
   libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
 
-  libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
-
   libdc1394 = callPackage ../development/libraries/libdc1394 {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };