Skip to content

Commit

Permalink
nix-cl: provide the original pname as an attribute
Browse files Browse the repository at this point in the history
Overrides often inherit pname from the overriden package, and if they
get the already-prefixed version, defaulting the systems list to [pname]
produces wrong (and unintuitive) results. So we keep the prefix in the
store paths for clarity, and nix-env sees disambiguated names with -i/-u
(which should not be used anyway); but overrides won't be broken.
  • Loading branch information
7c6f434c committed Jan 12, 2024
1 parent 55bfd59 commit 6815a00
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkgs/development/lisp-modules/nix-cl.nix
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ let
...
} @ args:

stdenv.mkDerivation (rec {
(stdenv.mkDerivation (rec {
inherit
version nativeLibs javaLibs lispLibs systems asds
pkg program flags faslExt
Expand Down Expand Up @@ -226,7 +226,14 @@ let
meta = (args.meta or {}) // {
maintainers = args.meta.maintainers or lib.teams.lisp.members;
};
})));
})) // {
# Useful for overriding
# Overriding code would prefer to use pname from the attribute set
# However, pname is extended with the implementation name
# Moreover, it is used in the default list of systems to load
# So we pass the original pname
pname = args.pname;
}));

# Build the set of lisp packages using `lisp`
# These packages are defined manually for one reason or another:
Expand Down

0 comments on commit 6815a00

Please sign in to comment.