alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #20686 from binarin/blivet-pvscan-unpatch

Browse source 
blivet: Remove unneccesary patching
This commit is contained in:
Tim Steinbach 2016-11-24 08:23:48 -05:00 committed by GitHub
parent 565bc19580 7e3176bca2
commit 290ca2817f
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/python-modules/blivet/default.nix
View file

@ -28,7 +28,6 @@ in buildPythonPackage rec {
}' blivet/formats/__init__.py }' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.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 -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [

1
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
View file

@ -28,7 +28,6 @@ buildPythonApplication rec {
}' blivet/formats/__init__.py }' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.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 -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 '' '' + stdenv.lib.optionalString useNixUdev ''
sed -i -e '/find_library/,/find_library/ { sed -i -e '/find_library/,/find_library/ {
c libudev = "${systemd.lib}/lib/libudev.so.1" c libudev = "${systemd.lib}/lib/libudev.so.1"