diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix deleted file mode 100644 index 5f76162453c4..000000000000 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchbzr, qt5, cmake }: - -stdenv.mkDerivation { - name = "libdbusmenu-qt-0.9.3+14"; - - src = fetchbzr { - url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; - rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; - sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; - }; - - buildInputs = [ qt5.base ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = "-DWITH_DOC=OFF"; - - meta = with stdenv.lib; { - homepage = "http://launchpad.net/libdbusmenu-qt"; - description = "Provides a Qt implementation of the DBusMenu spec"; - maintainers = [ maintainers.ttuegel ]; - inherit (qt5.base.meta) platforms; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4faf28518ebd..e55121ea39e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7026,8 +7026,6 @@ let libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; - libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt-5.4.nix { }; - libdc1394 = callPackage ../development/libraries/libdc1394 { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -15818,6 +15816,7 @@ aliases = with self; rec { inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; jquery_ui = jquery-ui; # added 2014-09-07 + libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 libtidy = html-tidy; # added 2014-12-21 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31