Merge pull request #279937 from Uthar/issue-3283

lisp-modules: Prepend Lisp name before package name for lisp pkgs
This commit is contained in:
7c6f434c 2024-01-10 16:45:08 +00:00 committed by GitHub
commit d5304c2bd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -147,7 +147,7 @@ let
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
inherit inherit
pname version nativeLibs javaLibs lispLibs systems asds version nativeLibs javaLibs lispLibs systems asds
pkg program flags faslExt pkg program flags faslExt
; ;
@ -216,6 +216,7 @@ let
dontStrip = true; dontStrip = true;
} // (args // { } // (args // {
pname = "${args.pkg.pname}-${args.pname}";
src = if builtins.length (args.patches or []) > 0 src = if builtins.length (args.patches or []) > 0
then pkgs.applyPatches { inherit (args) src patches; } then pkgs.applyPatches { inherit (args) src patches; }
else args.src; else args.src;