diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-15 07:58:52 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-15 07:58:52 +0000 |
| commit | 9d1daa60832979d5d361dfdac136fb9e5a1af2c5 (patch) | |
| tree | 5192dd85903cb092cf7dff0e3403387b3b683d84 /nixpkgs/pkgs/applications/editors/emacs/generic.nix | |
| parent | 67cdfc7d42f721bf85814af5a0095fb9f9ea455d (diff) | |
| parent | f2ea252d23ebc9a5336bf6a61e0644921f64e67c (diff) | |
| download | nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.gz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.bz2 nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.lz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.xz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.zst nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/emacs/generic.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/nixpkgs/pkgs/applications/editors/emacs/generic.nix index b322e19098cc..d3aabb739ec8 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -65,7 +65,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 @@ -405,6 +405,6 @@ mkDerivation (finalAttrs: { }; meta = meta // { - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; }) |