Unverified Commit 82567c8e authored by K900's avatar K900 Committed by GitHub
Browse files

libsForQt5.libdbusmenu: drop (#443745)

parents 21373650 f6c87dff

pkgs/desktops/lxqt/default.nix

+0 −12
Original line number Diff line number Diff line
@@ -74,18 +74,6 @@ let 
        lxqt-build-tools = lxqt-build-tools_0_13;

        inherit (pkgs.libsForQt5) qttools qtx11extras;

      };

      lxqt-qtplugin_1_4 = callPackage ./lxqt-qtplugin {

        version = "1.4.1";

        lxqt-build-tools = lxqt-build-tools_0_13;

        libqtxdg = libqtxdg_3_12;

        libfm-qt = libfm-qt_1_4;

        inherit (pkgs.libsForQt5)

          qtbase

          qtsvg

          qttools

          libdbusmenu

          ;

      };

      qtermwidget_1_4 = callPackage ./qtermwidget {

        version = "1.4.0";

        lxqt-build-tools = lxqt-build-tools_0_13;

pkgs/desktops/lxqt/lxqt-qtplugin/default.nix

+3 −10
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  fetchFromGitHub,

  cmake,

  libdbusmenu-lxqt,

  libdbusmenu ? null,

  libfm-qt,

  libqtxdg,

  lxqt-build-tools,
@@ -13,23 +12,17 @@ 
  qtsvg,

  qttools,

  wrapQtAppsHook,

  version ? "2.2.0",

}:



stdenv.mkDerivation rec {

  pname = "lxqt-qtplugin";

  inherit version;

  version = "2.2.0";



  src = fetchFromGitHub {

    owner = "lxqt";

    repo = pname;

    rev = version;

    hash =

      {

        "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";

        "2.2.0" = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";

      }

      ."${version}";

    hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";

  };



  nativeBuildInputs = [
@@ -40,7 +33,7 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    (if lib.versionAtLeast version "2.0.0" then libdbusmenu-lxqt else libdbusmenu)

    libdbusmenu-lxqt

    libfm-qt

    libqtxdg

    qtbase

pkgs/development/libraries/kde-frameworks/knotifications.nix

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
  kconfig,

  kcoreaddons,

  kwindowsystem,

  libdbusmenu,

  phonon,

  qttools,

  qtx11extras,
@@ -25,7 +24,6 @@ mkDerivation { 
    kconfig

    kcoreaddons

    kwindowsystem

    libdbusmenu

    phonon

    qtx11extras

  ]

pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchgit,

  cmake,

  qtbase,

}:



stdenv.mkDerivation rec {

  pname = "libdbusmenu-qt";

  version = "0.9.3+16";



  src = fetchgit {

    url = "https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt";

    rev = "import/${version}.04.20160218-1";

    sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx";

  };



  buildInputs = [ qtbase ];

  nativeBuildInputs = [ cmake ];



  cmakeFlags = [ "-DWITH_DOC=OFF" ];



  dontWrapQtApps = true;



  meta = with lib; {

    homepage = "https://launchpad.net/libdbusmenu-qt";

    description = "Provides a Qt implementation of the DBusMenu spec";

    maintainers = [ maintainers.ttuegel ];

    inherit (qtbase.meta) platforms;

    license = licenses.lgpl2;

  };

}

pkgs/top-level/qt5-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ makeScopeWithSplicing' { 


        libcommuni = callPackage ../development/libraries/libcommuni { };



        libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };



        libiodata = callPackage ../development/libraries/libiodata { };



        liblastfm = callPackage ../development/libraries/liblastfm { };