colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #191003 from abathur/resholve_fix_meta

Browse Source 
resholve: fix mangled pname/meta integrations
This commit is contained in:
Thiago Kenji Okada 2022-09-13 16:25:55 +01:00 committed by GitHub
commit dd61cabdc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/misc/resholve/resholve-utils.nix
View File

@ -167,7 +167,8 @@ rec {
*/
unresholved = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])
// {
inherit pname version src;
inherit version src;
pname = "${pname}-unresholved";
}));
in
/*
@ -178,8 +179,7 @@ rec {
*/
lib.extendDerivation true passthru (stdenv.mkDerivation {
src = unresholved;
version = unresholved.version;
pname = "resholved-${unresholved.pname}";
inherit version pname;
buildInputs = [ resholve ];
# retain a reference to the base
@ -199,5 +199,8 @@ rec {
# supports default python.logging levels
# LOGLEVEL="INFO";
preFixup = phraseSolutions solutions unresholved;
# don't break the metadata...
meta = unresholved.meta;
});
}