diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:14:41 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:14:41 +0200 |
| commit | 3209775495eef54ed5c61592ff302dab002f8825 (patch) | |
| tree | 3a9ff53ad1b7c8ea6db32f5f081a6f64079d6b9a /pkgs/stdenv | |
| parent | 610485faa7f8c043482c4a9c030938ed315557e5 (diff) | |
| parent | 6c72782d364149c7cfea1ea69fdbc1133acc80b5 (diff) | |
| download | nixlib-3209775495eef54ed5c61592ff302dab002f8825.tar nixlib-3209775495eef54ed5c61592ff302dab002f8825.tar.gz nixlib-3209775495eef54ed5c61592ff302dab002f8825.tar.bz2 nixlib-3209775495eef54ed5c61592ff302dab002f8825.tar.lz nixlib-3209775495eef54ed5c61592ff302dab002f8825.tar.xz nixlib-3209775495eef54ed5c61592ff302dab002f8825.tar.zst nixlib-3209775495eef54ed5c61592ff302dab002f8825.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 78f7a82d2952..37795b11f6dd 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -5,7 +5,7 @@ assert crossSystem == null; let - inherit (localSystem) system platform; + inherit (localSystem) system; shell = if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" |