diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-12 07:44:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 07:44:59 +0300 |
| commit | c5167858ca4870e933da123762eb55363ccefe2b (patch) | |
| tree | 3141762f89535bd2282148d09aa52f84cb921653 | |
| parent | Merge pull request #254549 from NixOS/backport-254394-to-release-23.05 (diff) | |
| parent | emacs: disable native compilation when cross-compiling (diff) | |
| download | nixpkgs-c5167858ca4870e933da123762eb55363ccefe2b.tar.gz | |
Merge pull request #254653 from NixOS/backport-245402-to-release-23.05
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 9da821de3f54..fdd8961f20fc 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -64,7 +64,7 @@ , withNativeCompilation ? if nativeComp != null then lib.warn "nativeComp option is deprecated and will be removed; use withNativeCompilation instead" nativeComp - else true + else stdenv.buildPlatform.canExecute stdenv.hostPlatform , noGui ? false , srcRepo ? true , withAcl ? false @@ -394,6 +394,6 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { }; meta = meta // { - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; })) |