diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/build-support/emacs | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/build-support/emacs')
-rw-r--r-- | nixpkgs/pkgs/build-support/emacs/buffer.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/build-support/emacs/generic.nix | 17 | ||||
-rw-r--r-- | nixpkgs/pkgs/build-support/emacs/wrapper.nix | 41 |
3 files changed, 21 insertions, 41 deletions
diff --git a/nixpkgs/pkgs/build-support/emacs/buffer.nix b/nixpkgs/pkgs/build-support/emacs/buffer.nix index 8f824f4e1a57..b8bd4584e322 100644 --- a/nixpkgs/pkgs/build-support/emacs/buffer.nix +++ b/nixpkgs/pkgs/build-support/emacs/buffer.nix @@ -73,7 +73,5 @@ rec { haskell-package-env = builtins.head haskell-package.env.nativeBuildInputs; in - if is-haskell-package - then withPackages [ haskell-package-env ] - else {}; + lib.optionalAttrs is-haskell-package (withPackages [ haskell-package-env ]); } diff --git a/nixpkgs/pkgs/build-support/emacs/generic.nix b/nixpkgs/pkgs/build-support/emacs/generic.nix index e3d1505dde87..add8fb5525f9 100644 --- a/nixpkgs/pkgs/build-support/emacs/generic.nix +++ b/nixpkgs/pkgs/build-support/emacs/generic.nix @@ -2,32 +2,25 @@ { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: -with lib; - { pname , version ? null - , buildInputs ? [] , packageRequires ? [] - , meta ? {} - , ... }@args: let - defaultMeta = { broken = false; platforms = emacs.meta.platforms; - } // optionalAttrs ((args.src.meta.homepage or "") != "") { + } // lib.optionalAttrs ((args.src.meta.homepage or "") != "") { homepage = args.src.meta.homepage; }; - in stdenv.mkDerivation ({ - name = "emacs-${pname}${optionalString (version != null) "-${version}"}"; + name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}"; unpackCmd = '' case "$curSrc" in @@ -68,7 +61,7 @@ stdenv.mkDerivation ({ meta = defaultMeta // meta; } -// lib.optionalAttrs (emacs.nativeComp or false) { +// lib.optionalAttrs (emacs.withNativeCompilation or false) { LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; @@ -90,6 +83,4 @@ stdenv.mkDerivation ({ ''; } -// removeAttrs args [ "buildInputs" "packageRequires" - "meta" - ]) +// removeAttrs args [ "buildInputs" "packageRequires" "meta" ]) diff --git a/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/nixpkgs/pkgs/build-support/emacs/wrapper.nix index bd7702ebb916..a3842dec6997 100644 --- a/nixpkgs/pkgs/build-support/emacs/wrapper.nix +++ b/nixpkgs/pkgs/build-support/emacs/wrapper.nix @@ -32,34 +32,25 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) */ -{ lib, lndir, makeWrapper, runCommand, gcc }: self: - -with lib; - +{ lib, lndir, makeWrapper, runCommand, gcc }: +self: let - inherit (self) emacs; - - nativeComp = emacs.nativeComp or false; - - treeSitter = emacs.treeSitter or false; - + withNativeCompilation = emacs.withNativeCompilation or emacs.nativeComp or false; + withTreeSitter = emacs.withTreeSitter or emacs.treeSitter or false; in - packagesFun: # packages explicitly requested by the user - let explicitRequires = if lib.isFunction packagesFun - then packagesFun self + then packagesFun self else packagesFun; in - runCommand - (appendToName "with-packages" emacs).name + (lib.appendToName "with-packages" emacs).name { - nativeBuildInputs = [ emacs lndir makeWrapper ]; inherit emacs explicitRequires; + nativeBuildInputs = [ emacs lndir makeWrapper ]; preferLocalBuild = true; allowSubstitutes = false; @@ -69,8 +60,8 @@ runCommand deps = runCommand "emacs-packages-deps" ({ inherit explicitRequires lndir emacs; - nativeBuildInputs = lib.optional nativeComp gcc; - } // lib.optionalAttrs nativeComp { + nativeBuildInputs = lib.optional withNativeCompilation gcc; + } // lib.optionalAttrs withNativeCompilation { inherit (emacs) LIBRARY_PATH; }) '' @@ -110,10 +101,10 @@ runCommand } mkdir -p $out/bin mkdir -p $out/share/emacs/site-lisp - ${optionalString nativeComp '' + ${lib.optionalString withNativeCompilation '' mkdir -p $out/share/emacs/native-lisp ''} - ${optionalString treeSitter '' + ${lib.optionalString withTreeSitter '' mkdir -p $out/lib ''} @@ -137,10 +128,10 @@ runCommand linkEmacsPackage() { linkPath "$1" "bin" "bin" linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" - ${optionalString nativeComp '' + ${lib.optionalString withNativeCompilation '' linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp" ''} - ${optionalString treeSitter '' + ${lib.optionalString withTreeSitter '' linkPath "$1" "lib" "lib" ''} } @@ -171,10 +162,10 @@ runCommand (load-file "$emacs/share/emacs/site-lisp/site-start.el")) (add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'exec-path "$out/bin") - ${optionalString nativeComp '' + ${lib.optionalString withNativeCompilation '' (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} - ${optionalString treeSitter '' + ${lib.optionalString withTreeSitter '' (add-to-list 'treesit-extra-load-path "$out/lib/") ''} EOF @@ -189,7 +180,7 @@ runCommand # Byte-compiling improves start-up time only slightly, but costs nothing. $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" - ${optionalString nativeComp '' + ${lib.optionalString withNativeCompilation '' $emacs/bin/emacs --batch \ --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ -f batch-native-compile "$siteStart" "$subdirs" |