diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:18:12 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:46 -0500 |
| commit | 078d54400583114b5ff36b69ed455a53a918a6fd (patch) | |
| tree | d67689cda8fac623bb024a6b6e1da3bb3980fbe5 | |
| parent | cf4defce2cfa47be6921f5583ce04183bb3d6232 (diff) | |
| download | nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.tar nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.tar.gz nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.tar.bz2 nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.tar.lz nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.tar.xz nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.tar.zst nixlib-078d54400583114b5ff36b69ed455a53a918a6fd.zip | |
libdbusmenu-qt5: build with Qt 5.5
| -rw-r--r-- | pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix (renamed from pkgs/development/libraries/libdbusmenu-qt/qt5.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix index 5f76162453c4..5f76162453c4 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix new file mode 100644 index 000000000000..e2ce87c2d66f --- /dev/null +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchbzr, cmake, qtbase }: + +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 = [ qtbase ]; + 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 4875ceb22fc2..b469a51f36dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6835,7 +6835,8 @@ let }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; - libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { }; + + libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt-5.4.nix { }; libdc1394 = callPackage ../development/libraries/libdc1394 { }; @@ -7935,6 +7936,8 @@ let qt5LibsFun = self: with self; { + libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; + phonon = callPackage ../development/libraries/phonon/qt5 { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; |