tjh.dev
corectrl: 1.2.7 -> 1.3.1
Also fixes build after the staging merge.
+14
-3
pkgs/applications/misc/corectrl/default.nix
+14
-3
pkgs/applications/misc/corectrl/default.nix
···
7
, libdrm
8
, hwdata
9
, glxinfo
10
, procps
11
, util-linux
12
, vulkan-tools
···
16
, qtsvg
17
, qttools
18
, qtxmlpatterns
19
, wrapQtAppsHook
20
} :
21
22
stdenv.mkDerivation rec{
23
pname = "corectrl";
24
-
version = "1.2.7";
25
26
src = fetchFromGitLab {
27
owner = "corectrl";
28
repo = "corectrl";
29
rev = "v${version}";
30
-
sha256 = "sha256-X+S+k9LuZveNOV3X7fulsnk9GfGO1czWEvU41q9/cJI=";
31
};
32
33
nativeBuildInputs = [
34
extra-cmake-modules
···
40
kauth
41
libdrm
42
glxinfo
43
procps
44
util-linux
45
vulkan-tools
···
49
qtsvg
50
qttools
51
qtxmlpatterns
52
];
53
54
-
cmakeFlags = [ "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" ];
55
56
runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ];
57
binPath = lib.makeBinPath runtimeDeps;
···
7
, libdrm
8
, hwdata
9
, glxinfo
10
+
, polkit
11
, procps
12
, util-linux
13
, vulkan-tools
···
17
, qtsvg
18
, qttools
19
, qtxmlpatterns
20
+
, quazip
21
, wrapQtAppsHook
22
} :
23
24
stdenv.mkDerivation rec{
25
pname = "corectrl";
26
+
version = "1.3.1";
27
28
src = fetchFromGitLab {
29
owner = "corectrl";
30
repo = "corectrl";
31
rev = "v${version}";
32
+
sha256 = "sha256-mVMyXpNhwljxsAvrKeHPxUSfdF/mfxG157T13Kb8PnE=";
33
};
34
+
patches = [
35
+
./polkit-dir.patch
36
+
];
37
38
nativeBuildInputs = [
39
extra-cmake-modules
···
45
kauth
46
libdrm
47
glxinfo
48
+
polkit
49
procps
50
util-linux
51
vulkan-tools
···
55
qtsvg
56
qttools
57
qtxmlpatterns
58
+
quazip
59
];
60
61
+
cmakeFlags = [
62
+
"-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids"
63
+
"-DINSTALL_DBUS_FILES_IN_PREFIX=true"
64
+
"-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions"
65
+
];
66
67
runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ];
68
binPath = lib.makeBinPath runtimeDeps;
+21
pkgs/applications/misc/corectrl/polkit-dir.patch
+21
pkgs/applications/misc/corectrl/polkit-dir.patch
···
···
1
+
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
2
+
index 1b7ed7c..757748c 100644
3
+
--- a/src/helper/CMakeLists.txt
4
+
+++ b/src/helper/CMakeLists.txt
5
+
@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
6
+
7
+
# Find polkit
8
+
pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
9
+
-execute_process(
10
+
- COMMAND pkg-config --variable=policydir polkit-gobject-1
11
+
- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
12
+
- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR
13
+
- OUTPUT_STRIP_TRAILING_WHITESPACE
14
+
-)
15
+
-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0")
16
+
- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config")
17
+
-endif()
18
+
+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory")
19
+
20
+
list(APPEND PROCESS_MONITOR_SRC
21
+
pmon/processmonitor.cpp