qt6.qtModule: removed unnecessary callPackage arguments

This commit is contained in:
Nick Cao
2023-04-10 18:00:35 +08:00
parent 5d13961fd6
commit c14e333ec0
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ let
inherit callPackage srcs;
qtModule = callPackage ./qtModule.nix { inherit self; };
qtModule = callPackage ./qtModule.nix { };
qtbase = callPackage ./modules/qtbase.nix {
withGtk3 = true;
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, perl, cmake, ninja, writeText, self, srcs, patches ? [ ] }:
{ stdenv, lib, perl, cmake, ninja, writeText, qtbase, qmake, srcs, patches ? [ ] }:
args:
@@ -16,7 +16,7 @@ stdenv.mkDerivation (args // {
perl
cmake
ninja
self.qmake
qmake
];
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
@@ -59,7 +59,7 @@ stdenv.mkDerivation (args // {
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
fi
'';