diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-06 06:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 06:01:30 +0000 |
| commit | 848091ac538359d60164ed5faa2e9dffbb33752f (patch) | |
| tree | 8a9e5b3497f7fd47e33007604111aee55844f777 /pkgs/build-support | |
| parent | bcf3e3f1c8c8ae503ac356125ba0712bce375ef5 (diff) | |
| parent | 82535bc9c1a7c80ff1c976f7889fedb3dd7b3243 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/emacs/generic.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index add8fb5525f99..291f45d513b7f 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -3,7 +3,7 @@ { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: { pname -, version ? null +, version , buildInputs ? [] , packageRequires ? [] , meta ? {} @@ -19,8 +19,8 @@ let }; in -stdenv.mkDerivation ({ - name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}"; +stdenv.mkDerivation (finalAttrs: ({ + name = "emacs-${pname}-${finalAttrs.version}"; unpackCmd = '' case "$curSrc" in @@ -83,4 +83,4 @@ stdenv.mkDerivation ({ ''; } -// removeAttrs args [ "buildInputs" "packageRequires" "meta" ]) +// removeAttrs args [ "buildInputs" "packageRequires" "meta" ])) |