diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-15 19:32:36 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-15 19:32:36 -0700 |
| commit | d1d37feb6d21180b7f7b47cf681613a09228da0a (patch) | |
| tree | 8f763f266007b4925454a9c4e3f6057789f916de /pkgs/os-specific/darwin | |
| parent | 91171e295574bd7721cafeaf4200c807952275a7 (diff) | |
| parent | 56e1dac7c81ec3efd937111966949e55134efab8 (diff) | |
| download | nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.gz nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.bz2 nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.lz nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.xz nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.zst nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.zip | |
Merge branch 'master' into staging-next
Conflicts: pkgs/servers/x11/xorg/default.nix
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index dedc7578951..b4d26327bdc 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79"; }; - buildFlags = [ "ARCHES=x86_64" ]; + buildFlags = + if stdenv.hostPlatform.system == "x86_64-darwin" then [ "ARCHES=x86_64" ] + else if stdenv.hostPlatform.system == "aarch64-darwin" then [ "ARCHES=arm64" ] + else throw "reattach-to-user-namespace isn't being built for ${stdenv.hostPlatform.system} yet."; installPhase = '' mkdir -p $out/bin |