pyrox.dev
ddcutil: 1.1.0 -> 1.2.0
+33
-17
pkgs/tools/misc/ddcutil/default.nix
+33
-17
pkgs/tools/misc/ddcutil/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
2
-
, glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }:
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, autoreconfHook
5
+
, pkg-config
6
+
, glib
7
+
, i2c-tools
8
+
, udev
9
+
, kmod
10
+
, libgudev
11
+
, libusb1
12
+
, libdrm
13
+
, xorg
14
+
}:
3
15
4
16
stdenv.mkDerivation rec {
5
17
pname = "ddcutil";
6
-
version = "1.1.0";
18
+
version = "1.2.0";
7
19
8
20
src = fetchFromGitHub {
9
-
owner = "rockowitz";
10
-
repo = "ddcutil";
11
-
rev = "v${version}";
12
-
sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc";
21
+
owner = "rockowitz";
22
+
repo = "ddcutil";
23
+
rev = "v${version}";
24
+
sha256 = "sha256-MH7WnJgROgLvttQEbd/21mLRFElObp4KINy8RarqkRo=";
13
25
};
14
26
15
-
patches = [
16
-
# Look for kernel modules in /run/booted-system/kernel-modules/lib/modules/*
17
-
./nixos-paths.diff
18
-
];
27
+
nativeBuildInputs = [ autoreconfHook pkg-config ];
19
28
20
-
nativeBuildInputs = [ autoreconfHook pkg-config ];
21
29
buildInputs = [
22
-
i2c-tools udev libgudev
23
-
glib libusb1 libdrm xorg.libXrandr
30
+
glib
31
+
i2c-tools
32
+
kmod
33
+
libdrm
34
+
libgudev
35
+
libusb1
36
+
udev
37
+
xorg.libXrandr
24
38
];
39
+
40
+
enableParallelBuilding = true;
25
41
26
42
meta = with lib; {
27
-
homepage = "http://www.ddcutil.com/";
43
+
homepage = "http://www.ddcutil.com/";
28
44
description = "Query and change Linux monitor settings using DDC/CI and USB";
29
-
license = licenses.gpl2;
30
-
platforms = platforms.linux;
45
+
license = licenses.gpl2;
46
+
platforms = platforms.linux;
31
47
maintainers = with maintainers; [ rnhmjoj ];
32
48
};
33
49
}
-30
pkgs/tools/misc/ddcutil/nixos-paths.diff
-30
pkgs/tools/misc/ddcutil/nixos-paths.diff
···
1
-
--- a/src/util/linux_util.c
2
-
+++ b/src/util/linux_util.c
3
-
@@ -125,6 +125,7 @@
4
-
"lib64",
5
-
"lib32",
6
-
"usr/lib", // needed for arch?
7
-
+ "run/booted-system/kernel-modules/lib", // NixOS
8
-
NULL};
9
-
int result = -1;
10
-
int ndx = 0;
11
-
@@ -204,14 +205,15 @@
12
-
if (debug)
13
-
printf("(%s) machine: %s", __func__, utsbuf.machine);
14
-
15
-
- char * libdirs[3];
16
-
+ char * libdirs[4];
17
-
libdirs[0] = "lib";
18
-
+ libdirs[1] = "run/booted-system/kernel-modules/lib";
19
-
if (streq(utsbuf.machine, "amd_64")){
20
-
- libdirs[1] = "lib64";
21
-
- libdirs[2] = NULL;
22
-
+ libdirs[2] = "lib64";
23
-
+ libdirs[3] = NULL;
24
-
}
25
-
else
26
-
- libdirs[1] = NULL;
27
-
+ libdirs[2] = NULL;
28
-
29
-
int libsndx = 0;
30
-
bool found = false;