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

Merge pull request #119526 from dotlambda/qtModule-pname

Browse Source 
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
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/qt-5/qtModule.nix
View File

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