diff options
| author | Sergey Mironov <ierton@gmail.com> | 2013-04-02 15:37:32 +0400 |
|---|---|---|
| committer | Sergey Mironov <ierton@gmail.com> | 2013-04-04 12:02:53 +0400 |
| commit | b1386e4a0920ba7d29b07ea5c620236961bbb235 (patch) | |
| tree | 28f8dc0d9b6b02d4ca460e3b3c245f8f2858c00a /pkgs/os-specific/linux/udisks | |
| parent | 979f2b01102f9d3049d696805a399aec3a57f979 (diff) | |
| download | nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.tar nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.tar.gz nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.tar.bz2 nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.tar.lz nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.tar.xz nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.tar.zst nixpkgs-b1386e4a0920ba7d29b07ea5c620236961bbb235.zip | |
fix udisks2 paths
Diffstat (limited to 'pkgs/os-specific/linux/udisks')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/2-default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udisks/force-path.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index b7be51c56fc..28cdbe18978 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -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" ''; diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/os-specific/linux/udisks/force-path.patch new file mode 100644 index 00000000000..16c7ea5322f --- /dev/null +++ b/pkgs/os-specific/linux/udisks/force-path.patch @@ -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); + |