Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"

Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
This commit is contained in:
Shea Levy
2016-08-15 19:05:52 -04:00
parent 57b2d1e9b0
commit 9adad8612b
39 changed files with 299 additions and 363 deletions
@@ -93,7 +93,7 @@ let
echo "stripping FHS paths in \`$mf'..."
sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'
done
sed -i Makefile -e 's|= depmod|= ${kmod}/bin/depmod|'
sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|'
'';
configurePhase = ''
@@ -188,7 +188,7 @@ let
find -empty -type d -delete
# Remove reference to kmod
sed -i Makefile -e 's|= ${kmod}/bin/depmod|= depmod|'
sed -i Makefile -e 's|= ${kmod}/sbin/depmod|= depmod|'
'' else optionalString installsFirmware ''
make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}"