pyrox.dev
corectrl: 1.4.3 -> 1.5.1
+14
pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
+14
pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
···
1
+
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
2
+
index 38deb12..7bbaa81 100644
3
+
--- a/src/helper/CMakeLists.txt
4
+
+++ b/src/helper/CMakeLists.txt
5
+
@@ -27,8 +27,8 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
6
+
option(POLKIT_POLICY_INSTALL_DIR "Polkit policy files installation directory" OFF)
7
+
8
+
# Find polkit
9
+
+pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
10
+
if(NOT POLKIT_POLICY_INSTALL_DIR)
11
+
- pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
12
+
execute_process(
13
+
COMMAND pkg-config --variable=policydir polkit-gobject-1
14
+
RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
+18
-17
pkgs/by-name/co/corectrl/package.nix
+18
-17
pkgs/by-name/co/corectrl/package.nix
···
1
1
{
2
2
botan3,
3
-
extra-cmake-modules,
4
3
fetchFromGitLab,
4
+
cmake,
5
+
pkg-config,
5
6
hwdata,
6
7
lib,
7
8
libdrm,
8
-
libsForQt5,
9
+
kdePackages,
9
10
mesa-demos,
10
11
polkit,
11
12
procps,
···
18
19
19
20
stdenv.mkDerivation (finalAttrs: {
20
21
pname = "corectrl";
21
-
version = "1.4.3";
22
+
version = "1.5.1";
22
23
23
24
src = fetchFromGitLab {
24
25
owner = "corectrl";
25
26
repo = "corectrl";
26
-
rev = "refs/tags/v${finalAttrs.version}";
27
-
hash = "sha256-rQibIjLmSnkA8jk6GOo68JIeb4wZq0wxXpLs3zsB7GI=";
27
+
tag = "v${finalAttrs.version}";
28
+
hash = "sha256-NwGrvDqImiyPc3AsL7rMwNG9na+AzZS6NvXQOc6VWHg=";
28
29
};
29
30
30
31
nativeBuildInputs = [
31
-
extra-cmake-modules
32
-
libsForQt5.wrapQtAppsHook
32
+
cmake
33
+
pkg-config
34
+
kdePackages.extra-cmake-modules
35
+
kdePackages.wrapQtAppsHook
33
36
];
34
37
35
38
buildInputs = [
36
39
botan3
37
40
libdrm # TODO: report upstream that libdrm is not detected at configure time
38
-
libsForQt5.karchive
39
-
libsForQt5.kauth
40
-
libsForQt5.qtbase
41
-
libsForQt5.qtcharts
42
-
libsForQt5.qtquickcontrols2
43
-
libsForQt5.qtsvg
44
-
libsForQt5.qttools
45
-
libsForQt5.qtxmlpatterns
46
-
libsForQt5.quazip
41
+
kdePackages.karchive
42
+
kdePackages.kauth
43
+
kdePackages.qtbase
44
+
kdePackages.qtcharts
45
+
kdePackages.qtsvg
46
+
kdePackages.qttools
47
+
kdePackages.quazip
47
48
mesa-demos
48
49
polkit
49
50
procps
···
54
55
];
55
56
56
57
patches = [
57
-
./polkit-dir.patch
58
+
./Always-locate-polkit-with-pkg-config.diff
58
59
];
59
60
60
61
cmakeFlags = [
-21
pkgs/by-name/co/corectrl/polkit-dir.patch
-21
pkgs/by-name/co/corectrl/polkit-dir.patch
···
1
-
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
2
-
index 3fe2ace..2542ea1 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 HELPER_COMPILE_DEFINITIONS
21
-
ELPP_THREAD_SAFE