diff options
Diffstat (limited to 'pkgs/tools/filesystems/nixpart/0.4/blivet.nix')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 4033cdc87e0e..0995a8bfd23e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux -, useNixUdev ? true, udev ? null +, useNixUdev ? true, libudev ? null # This is only used when useNixUdev is false , udevSoMajor ? 1 }: -assert useNixUdev -> udev != null; +assert useNixUdev -> libudev != null; buildPythonPackage rec { name = "blivet-${version}"; @@ -29,7 +29,7 @@ buildPythonPackage rec { sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + (if useNixUdev then '' sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev.libudev}/lib/libudev.so.1" + c libudev = "${libudev.out}/lib/libudev.so.1" }' blivet/pyudev.py '' else '' sed -i \ @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pykickstart pyparted pyblock libselinux cryptsetup - ] ++ stdenv.lib.optional useNixUdev udev; + ] ++ stdenv.lib.optional useNixUdev libudev; # tests are currently _heavily_ broken upstream doCheck = false; |