mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 23:23:07 +00:00
fc79a83e68
Continuation of https://github.com/NixOS/nixpkgs/pull/67306 * Switched to non-deprecated dbus config path. * Removed CMake flags for finding dependencies, the project can find them on its own. * Properly fixed the RPATH issue from https://github.com/NixOS/nixpkgs/pull/15406 – ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}. * Dropped changing Icon name in the desktop file as it was fixed upstream. * Switched to fetchFromGitHub, as the submodules are only for Win, Mac & crash reporting. * Dropped enableParallelBuilding = true, as it is on by default with CMake.
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Bosch <maximilian@mbosch.me>
|
|
Date: Fri, 23 Aug 2019 00:19:20 +0200
|
|
Subject: [PATCH] Explicitly copy dbus files into the store dir
|
|
|
|
---
|
|
shell_integration/libcloudproviders/CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
|
|
index 1f35335..7f76951 100644
|
|
--- a/shell_integration/libcloudproviders/CMakeLists.txt
|
|
+++ b/shell_integration/libcloudproviders/CMakeLists.txt
|
|
@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable)
|
|
ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable)
|
|
|
|
macro(dbus_add_activation_service _sources)
|
|
- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
|
|
+ set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service")
|
|
foreach (_i ${_sources})
|
|
get_filename_component(_service_file ${_i} ABSOLUTE)
|
|
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
|
|
--
|
|
2.19.2
|
|
|