diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-14 12:57:45 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-19 17:56:45 +0300 |
| commit | ff227057931f5977352f7583b00f9d1f8cf43da5 (patch) | |
| tree | 3376e6299595a2104763a380f77d0652d2f0177a /pkgs/os-specific | |
| parent | 30c9aa269892c55193dc560175c8c2f3e8fcaf70 (diff) | |
| download | nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.tar nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.tar.gz nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.tar.bz2 nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.tar.lz nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.tar.xz nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.tar.zst nixlib-ff227057931f5977352f7583b00f9d1f8cf43da5.zip | |
treewide: replace several /sbin paths by /bin
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kmod/aggregator.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8da8f20eae27..c5a4ba2b18ad 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -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}/sbin/depmod|' + sed -i Makefile -e 's|= depmod|= ${kmod}/bin/depmod|' ''; configurePhase = '' @@ -188,7 +188,7 @@ let find -empty -type d -delete # Remove reference to kmod - sed -i Makefile -e 's|= ${kmod}/sbin/depmod|= depmod|' + sed -i Makefile -e 's|= ${kmod}/bin/depmod|= depmod|' '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 161af38ff608..88069ba4bf13 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -21,7 +21,7 @@ buildEnv { # kernel version number, otherwise depmod will use `uname -r'. if test -w $out/lib/modules/$kernelVersion; then rm -f $out/lib/modules/$kernelVersion/modules.* - ${kmod}/sbin/depmod -b $out -a $kernelVersion + ${kmod}/bin/depmod -b $out -a $kernelVersion fi ''; } |