nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix udisks2 paths

Browse Source
This commit is contained in:
Sergey Mironov 2013-04-02 15:37:32 +04:00
parent 979f2b0110
commit b1386e4a09
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/udisks/2-default.nix
View File

@ -11,10 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii";
};
patches = [ ./force-path.patch ];
# FIXME remove /var/run/current-system/sw/* references
# FIXME add references to parted, cryptsetup, etc (see the sources)
postPatch =
''
substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \
"@path@" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
'';

13
pkgs/os-specific/linux/udisks/force-path.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ruN udisks-2.1.0.orig/src/main.c udisks-2.1.0/src/main.c
--- udisks-2.1.0.orig/src/main.c 2013-04-02 10:43:41.629332135 +0000
+++ udisks-2.1.0/src/main.c 2013-04-02 11:04:55.635342823 +0000
@@ -140,8 +140,7 @@
}
}
- if (g_getenv ("PATH") == NULL)
- g_setenv ("PATH", "/usr/bin:/bin:/usr/sbin:/sbin", TRUE);
+ g_setenv ("PATH", "@path@", TRUE);
udisks_notice ("udisks daemon version %s starting", PACKAGE_VERSION);