Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging

2016-04-25 18:02:23 +03:00
parent 09f02b918e 69a072484d
commit 5f19542581
41 changed files with 107 additions and 115 deletions
@@ -58,7 +58,7 @@ let
      path = (makeBinPath ([
        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
        pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
-      )) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [
+      )) + ":" + (makeSearchPathOutput "bin" "sbin" [
        pkgs.mdadm pkgs.utillinux
      ]);
    });