ddcutil: 1.0.1 -> 1.1.0
This commit is contained in:
parent
793562da34
commit
61f2b36624
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ddcutil";
|
pname = "ddcutil";
|
||||||
version = "1.0.1";
|
version = "1.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rockowitz";
|
owner = "rockowitz";
|
||||||
repo = "ddcutil";
|
repo = "ddcutil";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU=";
|
sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -1,32 +1,30 @@
|
||||||
diff --git a/src/app_sysenv/query_sysenv_modules.c b/src/app_sysenv/query_sysenv_modules.c
|
|
||||||
index 59df64f1..fb244dd0 100644
|
|
||||||
--- a/src/app_sysenv/query_sysenv_modules.c
|
|
||||||
+++ b/src/app_sysenv/query_sysenv_modules.c
|
|
||||||
@@ -50,7 +50,9 @@ bool is_module_loadable(char * module_name, int depth) {
|
|
||||||
g_snprintf(module_name_ko, 100, "%s.ko", module_name);
|
|
||||||
|
|
||||||
char dirname[PATH_MAX];
|
|
||||||
- g_snprintf(dirname, PATH_MAX, "/lib/modules/%s/kernel/drivers/i2c", utsbuf.release);
|
|
||||||
+ g_snprintf(dirname, PATH_MAX,
|
|
||||||
+ "/run/booted-system/kernel-modules/lib/modules/%s/kernel/drivers/i2c",
|
|
||||||
+ utsbuf.release);
|
|
||||||
|
|
||||||
struct dirent *dent;
|
|
||||||
DIR *d;
|
|
||||||
diff --git a/src/util/linux_util.c b/src/util/linux_util.c
|
|
||||||
index 5eb8491c..3a129ccf 100644
|
|
||||||
--- a/src/util/linux_util.c
|
--- a/src/util/linux_util.c
|
||||||
+++ b/src/util/linux_util.c
|
+++ b/src/util/linux_util.c
|
||||||
@@ -29,8 +29,10 @@ bool is_module_builtin(char * module_name)
|
@@ -125,6 +125,7 @@
|
||||||
int rc = uname(&utsbuf);
|
"lib64",
|
||||||
assert(rc == 0);
|
"lib32",
|
||||||
|
"usr/lib", // needed for arch?
|
||||||
|
+ "run/booted-system/kernel-modules/lib", // NixOS
|
||||||
|
NULL};
|
||||||
|
int result = -1;
|
||||||
|
int ndx = 0;
|
||||||
|
@@ -204,14 +205,15 @@
|
||||||
|
if (debug)
|
||||||
|
printf("(%s) machine: %s", __func__, utsbuf.machine);
|
||||||
|
|
||||||
- char modules_builtin_fn[100];
|
- char * libdirs[3];
|
||||||
- snprintf(modules_builtin_fn, 100, "/lib/modules/%s/modules.builtin", utsbuf.release);
|
+ char * libdirs[4];
|
||||||
+ char modules_builtin_fn[PATH_MAX];
|
libdirs[0] = "lib";
|
||||||
+ snprintf(modules_builtin_fn, PATH_MAX,
|
+ libdirs[1] = "run/booted-system/kernel-modules/lib";
|
||||||
+ "/run/booted-system/kernel-modules/lib/modules/%s/modules.builtin",
|
if (streq(utsbuf.machine, "amd_64")){
|
||||||
+ utsbuf.release);
|
- libdirs[1] = "lib64";
|
||||||
|
- libdirs[2] = NULL;
|
||||||
|
+ libdirs[2] = "lib64";
|
||||||
|
+ libdirs[3] = NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- libdirs[1] = NULL;
|
||||||
|
+ libdirs[2] = NULL;
|
||||||
|
|
||||||
char ko_name[40];
|
int libsndx = 0;
|
||||||
snprintf(ko_name, 40, "%s.ko", module_name);
|
bool found = false;
|
||||||
|
|
Loading…
Reference in a new issue