diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 2b8dccf162c..da54865a18b 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -19,6 +19,7 @@ top-level attribute to `top-level/all-packages.nix`. , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf , darwin +, buildPackages # options , developerBuild ? false @@ -236,7 +237,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev makeWrapper ] + deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index b95d49fef87..59b04b6a52c 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -19,6 +19,7 @@ top-level attribute to `top-level/all-packages.nix`. , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf , darwin +, buildPackages # options , developerBuild ? false @@ -234,7 +235,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev makeWrapper ] + deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 763bfc675cb..02b1b0db99b 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -12,6 +12,7 @@ Check for any minor version changes. , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf , darwin +, buildPackages # options , developerBuild ? false @@ -192,7 +193,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev makeWrapper ] + deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280a79821a3..e9aa725e45c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20277,6 +20277,7 @@ with pkgs; inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; + inherit buildPackages; stdenv = if stdenv.cc.isGNU then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) else stdenv; @@ -20289,6 +20290,7 @@ with pkgs; inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; + inherit buildPackages; stdenv = if stdenv.cc.isGNU then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) else stdenv; @@ -20301,6 +20303,7 @@ with pkgs; inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; + inherit buildPackages; }); libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {