diff options
| author | Felix Buehler <account@buehler.rocks> | 2022-03-01 13:44:08 +0100 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-03-02 11:00:53 -0800 |
| commit | 2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe (patch) | |
| tree | 484a0287df4cb23eb091cd6804ed259e785a1a5d /pkgs | |
| parent | 6bcfd611090b40d94d000b65179b19636cc8fe6c (diff) | |
| download | nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.tar nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.tar.gz nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.tar.bz2 nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.tar.lz nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.tar.xz nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.tar.zst nixpkgs-2e5f265fdb2d0df2023864e56b5bc54ef9f67fbe.zip | |
emacs-nox: remove appendToName to have a consistent package name for repology
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 946dba0af8f..82a1d6af832 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -53,7 +53,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { - inherit pname version; + pname = pname + lib.optionalString ( !withX && !withNS && !withGTK2 && !withGTK3 ) "-nox"; + inherit version; patches = patches fetchpatch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7628217ef7e..97b80a197d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25306,12 +25306,12 @@ with pkgs; inherit (darwin) sigtool; }; - emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { + emacs27-nox = lowPrio (emacs27.override { withX = false; withNS = false; withGTK2 = false; withGTK3 = false; - })); + }); emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) |