diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 14:41:34 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 20:38:13 +0000 |
| commit | 7079e744d4666db3af186899fe2fc0ef3cbeb842 (patch) | |
| tree | d65e951be75dab998ecd2e8337e1c30e7722e28c /pkgs/stdenv/linux | |
| parent | 4eec6bc9c9cafac55dbf774a2fd30da7e5a79cc4 (diff) | |
| parent | ddddca5c2fe1c93369404979ac194a1bc5d5fbaf (diff) | |
| download | nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.gz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.bz2 nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.lz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.xz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.zst nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.zip | |
Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 8033d47d5db5..5522bc5dea25 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -88,7 +88,7 @@ in with pkgs; rec { '' else throw "unsupported libc for bootstrap tools") + '' # Copy coreutils, bash, etc. - cp ${coreutilsMinimal.out}/bin/* $out/bin + cp -d ${coreutilsMinimal.out}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) cp ${bash.out}/bin/bash $out/bin |