diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-23 07:22:48 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-23 07:23:32 -0500 |
| commit | 355e3e90b350edfbc5a50d3a84b1fe752300b023 (patch) | |
| tree | 463bd29791e2da0f9b856aed9f85f908666cd673 /pkgs/applications/audio/clementine | |
| parent | a89c14dc3c61844970b7644404f39ae3611f049f (diff) | |
| download | nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.tar nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.tar.gz nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.tar.bz2 nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.tar.lz nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.tar.xz nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.tar.zst nixlib-355e3e90b350edfbc5a50d3a84b1fe752300b023.zip | |
clementine: patch for cmake-3.2
Diffstat (limited to 'pkgs/applications/audio/clementine')
| -rw-r--r-- | pkgs/applications/audio/clementine/clementine-dbus-namespace.patch | 36 | ||||
| -rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 6 |
2 files changed, 41 insertions, 1 deletions
diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch new file mode 100644 index 000000000000..2240debd0e4a --- /dev/null +++ b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch @@ -0,0 +1,36 @@ +From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 +From: Chocobozzz <florian.chocobo@gmail.com> +Date: Wed, 16 Jul 2014 15:57:25 +0200 +Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 + +--- + src/CMakeLists.txt | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 650fa74..775b0a5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) + if(HAVE_DBUS) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) + +- # Hack to get it to generate interfaces without namespaces - required +- # because otherwise org::freedesktop::UDisks and +- # org::freedesktop::UDisks::Device conflict. +- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) +- + # MPRIS DBUS interfaces + qt4_add_dbus_adaptor(SOURCES + dbus/org.freedesktop.MediaPlayer.player.xml +@@ -964,6 +959,10 @@ if(HAVE_DBUS) + + # DeviceKit DBUS interfaces + if(HAVE_DEVICEKIT) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.xml ++ PROPERTIES NO_NAMESPACE dbus/udisks) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml ++ PROPERTIES NO_NAMESPACE dbus/udisksdevice) + qt4_add_dbus_interface(SOURCES + dbus/org.freedesktop.UDisks.xml + dbus/udisks) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 857aa2edaf5e..538f54fbaf81 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation { sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; }; - patches = [ ./clementine-1.2.1-include-paths.patch ]; + patches = + [ + ./clementine-1.2.1-include-paths.patch + ./clementine-dbus-namespace.patch + ]; buildInputs = [ boost |