diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 9346bc56099e..d790ecafbf4d 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -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; diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 896455cbb27a..4a149108e077 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -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 '';