qt6.qtModule: removed unnecessary callPackage arguments
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user