pyrox.dev
lol
fix udisks2 paths
+18
-1
+5
-1
pkgs/os-specific/linux/udisks/2-default.nix
+5
-1
pkgs/os-specific/linux/udisks/2-default.nix
···
11
11
sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii";
12
12
};
13
13
14
+
patches = [ ./force-path.patch ];
15
+
16
+
# FIXME remove /var/run/current-system/sw/* references
17
+
# FIXME add references to parted, cryptsetup, etc (see the sources)
14
18
postPatch =
15
19
''
16
20
substituteInPlace src/main.c --replace \
17
-
"/sbin:/bin:/usr/sbin:/usr/bin" \
21
+
"@path@" \
18
22
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
19
23
'';
20
24
+13
pkgs/os-specific/linux/udisks/force-path.patch
+13
pkgs/os-specific/linux/udisks/force-path.patch
···
1
+
diff -ruN udisks-2.1.0.orig/src/main.c udisks-2.1.0/src/main.c
2
+
--- udisks-2.1.0.orig/src/main.c 2013-04-02 10:43:41.629332135 +0000
3
+
+++ udisks-2.1.0/src/main.c 2013-04-02 11:04:55.635342823 +0000
4
+
@@ -140,8 +140,7 @@
5
+
}
6
+
}
7
+
8
+
- if (g_getenv ("PATH") == NULL)
9
+
- g_setenv ("PATH", "/usr/bin:/bin:/usr/sbin:/sbin", TRUE);
10
+
+ g_setenv ("PATH", "@path@", TRUE);
11
+
12
+
udisks_notice ("udisks daemon version %s starting", PACKAGE_VERSION);
13
+