corectrl: 1.2.7 -> 1.3.1
Also fixes build after the staging merge.
This commit is contained in:
parent
95aeaf83c2
commit
729d0cf1e0
|
@ -7,6 +7,7 @@
|
||||||
, libdrm
|
, libdrm
|
||||||
, hwdata
|
, hwdata
|
||||||
, glxinfo
|
, glxinfo
|
||||||
|
, polkit
|
||||||
, procps
|
, procps
|
||||||
, util-linux
|
, util-linux
|
||||||
, vulkan-tools
|
, vulkan-tools
|
||||||
|
@ -16,19 +17,23 @@
|
||||||
, qtsvg
|
, qtsvg
|
||||||
, qttools
|
, qttools
|
||||||
, qtxmlpatterns
|
, qtxmlpatterns
|
||||||
|
, quazip
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
} :
|
} :
|
||||||
|
|
||||||
stdenv.mkDerivation rec{
|
stdenv.mkDerivation rec{
|
||||||
pname = "corectrl";
|
pname = "corectrl";
|
||||||
version = "1.2.7";
|
version = "1.3.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "corectrl";
|
owner = "corectrl";
|
||||||
repo = "corectrl";
|
repo = "corectrl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-X+S+k9LuZveNOV3X7fulsnk9GfGO1czWEvU41q9/cJI=";
|
sha256 = "sha256-mVMyXpNhwljxsAvrKeHPxUSfdF/mfxG157T13Kb8PnE=";
|
||||||
};
|
};
|
||||||
|
patches = [
|
||||||
|
./polkit-dir.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
|
@ -40,6 +45,7 @@ stdenv.mkDerivation rec{
|
||||||
kauth
|
kauth
|
||||||
libdrm
|
libdrm
|
||||||
glxinfo
|
glxinfo
|
||||||
|
polkit
|
||||||
procps
|
procps
|
||||||
util-linux
|
util-linux
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
|
@ -49,9 +55,14 @@ stdenv.mkDerivation rec{
|
||||||
qtsvg
|
qtsvg
|
||||||
qttools
|
qttools
|
||||||
qtxmlpatterns
|
qtxmlpatterns
|
||||||
|
quazip
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [ "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" ];
|
cmakeFlags = [
|
||||||
|
"-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids"
|
||||||
|
"-DINSTALL_DBUS_FILES_IN_PREFIX=true"
|
||||||
|
"-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions"
|
||||||
|
];
|
||||||
|
|
||||||
runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ];
|
runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ];
|
||||||
binPath = lib.makeBinPath runtimeDeps;
|
binPath = lib.makeBinPath runtimeDeps;
|
||||||
|
|
21
pkgs/applications/misc/corectrl/polkit-dir.patch
Normal file
21
pkgs/applications/misc/corectrl/polkit-dir.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
|
||||||
|
index 1b7ed7c..757748c 100644
|
||||||
|
--- a/src/helper/CMakeLists.txt
|
||||||
|
+++ b/src/helper/CMakeLists.txt
|
||||||
|
@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
|
||||||
|
|
||||||
|
# Find polkit
|
||||||
|
pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
|
||||||
|
-execute_process(
|
||||||
|
- COMMAND pkg-config --variable=policydir polkit-gobject-1
|
||||||
|
- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
|
||||||
|
- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR
|
||||||
|
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
-)
|
||||||
|
-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0")
|
||||||
|
- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config")
|
||||||
|
-endif()
|
||||||
|
+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory")
|
||||||
|
|
||||||
|
list(APPEND PROCESS_MONITOR_SRC
|
||||||
|
pmon/processmonitor.cpp
|
Loading…
Reference in a new issue