forked from mirrors/nixpkgs
Merge pull request #20686 from binarin/blivet-pvscan-unpatch
blivet: Remove unneccesary patching
This commit is contained in:
commit
290ca2817f
|
@ -28,7 +28,6 @@ in buildPythonPackage rec {
|
|||
}' blivet/formats/__init__.py
|
||||
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
|
||||
sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
|
||||
sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -28,7 +28,6 @@ buildPythonApplication rec {
|
|||
}' blivet/formats/__init__.py
|
||||
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
|
||||
sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
|
||||
sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
|
||||
'' + stdenv.lib.optionalString useNixUdev ''
|
||||
sed -i -e '/find_library/,/find_library/ {
|
||||
c libudev = "${systemd.lib}/lib/libudev.so.1"
|
||||
|
|
Loading…
Reference in a new issue