Merge pull request #119526 from dotlambda/qtModule-pname

qtModule: use pname and version
This commit is contained in:
Thomas Tuegel 2021-04-17 17:57:37 -05:00 committed by GitHub
commit 0765db9135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,15 +7,14 @@ let inherit (lib) licenses maintainers platforms; in
args:
let
inherit (args) name;
version = args.version or srcs.${name}.version;
src = args.src or srcs.${name}.src;
pname = args.name;
version = args.version or srcs.${pname}.version;
src = args.src or srcs.${pname}.src;
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
patches = args.patches or patches.${name} or [];
inherit pname version src;
patches = args.patches or patches.${pname} or [];
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);