diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
| commit | ad47d658d1734353df834a05e45b98dae968550d (patch) | |
| tree | 5ee2481126f5e29cf961e3b955b748609bc08f82 /pkgs/stdenv | |
| parent | 8213ff161c461655aaff7d43984384dbca64b312 (diff) | |
| parent | cc218fc91530529b84307faf6fa2dd8c5d395d6f (diff) | |
| download | nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.gz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.bz2 nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.lz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.xz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.zst nixlib-ad47d658d1734353df834a05e45b98dae968550d.zip | |
Merge master into staging-next
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" |