summary refs log tree commit diff
path: root/pkgs/os-specific/linux/udisks
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2015-12-15 02:38:07 +0300
committerVladimír Čunát <vcunat@gmail.com>2015-12-22 08:09:34 +0100
commit0d7c0efa7d27c8399cdc3079f7a23144919bc286 (patch)
treec8094323c536b6a43179a7d55baf37c28b0463ea /pkgs/os-specific/linux/udisks
parentd856841ba42eb8ad56e71c261753cc5b7f02d6c9 (diff)
downloadnixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.tar
nixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.tar.gz
nixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.tar.bz2
nixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.tar.lz
nixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.tar.xz
nixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.tar.zst
nixpkgs-0d7c0efa7d27c8399cdc3079f7a23144919bc286.zip
udisks2: fix udev rules file (close #11743)
This properly hides system partitions (like EFI or Windows recovery) from UDisks.
Diffstat (limited to 'pkgs/os-specific/linux/udisks')
-rw-r--r--pkgs/os-specific/linux/udisks/2-default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 060d9ad1dd3..35873b3a062 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool
+{ stdenv, fetchurl, pkgconfig, intltool, gnused
 , expat, acl, systemd, glib, libatasmart, polkit
 , libxslt, docbook_xsl, utillinux, mdadm, libgudev
 }:
@@ -21,7 +21,11 @@ stdenv.mkDerivation rec {
     ''
       substituteInPlace src/main.c --replace \
         "@path@" \
-        "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin"
+        "${utillinux}/bin:${mdadm}/bin:/run/current-system/sw/bin"
+      substituteInPlace data/80-udisks2.rules \
+        --replace "/bin/sh" "${stdenv.shell}" \
+        --replace "/sbin/mdadm" "${mdadm}/bin/mdadm" \
+        --replace " sed " " ${gnused}/bin/sed "
     '';
 
   nativeBuildInputs = [ pkgconfig intltool ];