diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-06 06:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 06:00:55 +0000 |
| commit | 82535bc9c1a7c80ff1c976f7889fedb3dd7b3243 (patch) | |
| tree | 3710c7a80a33bf59e66f5cd30e9dcd611fc2a0a9 /pkgs/build-support | |
| parent | 72eff9fe5d49ba7ee36984b2c8b21e1481f06a83 (diff) | |
| parent | 8fa0d873d4b40b7fb919632d258170d22c503e28 (diff) | |
Merge master into staging-next
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" ])) |