pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #177477 from dotlambda/wrapQtAppsHook-cross

libsForQt5.wrapQtAppsHook: fix cross

authored by Rick van Schijndel and committed by GitHub 83fb2a5e a2af6723

+12 -4
unified split
+2 -1
pkgs/development/libraries/qt-5/5.12/default.nix
··· 19 19 , bison, cups ? null, harfbuzz, libGL, perl 20 20 , gstreamer, gst-plugins-base, gtk3, dconf 21 21 , darwin 22 + , buildPackages 22 23 23 24 # options 24 25 , developerBuild ? false ··· 236 237 } ../hooks/qmake-hook.sh; 237 238 238 239 wrapQtAppsHook = makeSetupHook { 239 - deps = [ self.qtbase.dev makeWrapper ] 240 + deps = [ self.qtbase.dev buildPackages.makeWrapper ] 240 241 ++ lib.optional stdenv.isLinux self.qtwayland.dev; 241 242 } ../hooks/wrap-qt-apps-hook.sh; 242 243 };
+2 -1
pkgs/development/libraries/qt-5/5.14/default.nix
··· 19 19 , bison, cups ? null, harfbuzz, libGL, perl 20 20 , gstreamer, gst-plugins-base, gtk3, dconf 21 21 , darwin 22 + , buildPackages 22 23 23 24 # options 24 25 , developerBuild ? false ··· 234 235 } ../hooks/qmake-hook.sh; 235 236 236 237 wrapQtAppsHook = makeSetupHook { 237 - deps = [ self.qtbase.dev makeWrapper ] 238 + deps = [ self.qtbase.dev buildPackages.makeWrapper ] 238 239 ++ lib.optional stdenv.isLinux self.qtwayland.dev; 239 240 } ../hooks/wrap-qt-apps-hook.sh; 240 241 };
+2 -1
pkgs/development/libraries/qt-5/5.15/default.nix
··· 12 12 , bison, cups ? null, harfbuzz, libGL, perl 13 13 , gstreamer, gst-plugins-base, gtk3, dconf 14 14 , darwin 15 + , buildPackages 15 16 16 17 # options 17 18 , developerBuild ? false ··· 192 193 } ../hooks/qmake-hook.sh; 193 194 194 195 wrapQtAppsHook = makeSetupHook { 195 - deps = [ self.qtbase.dev makeWrapper ] 196 + deps = [ self.qtbase.dev buildPackages.makeWrapper ] 196 197 ++ lib.optional stdenv.isLinux self.qtwayland.dev; 197 198 } ../hooks/wrap-qt-apps-hook.sh; 198 199 };
+2 -1
pkgs/development/libraries/qt-6/default.nix
··· 19 19 , gst-plugins-base 20 20 , gtk3 21 21 , dconf 22 + , buildPackages 22 23 23 24 # options 24 25 , developerBuild ? false ··· 84 85 qtwebview = callPackage ./modules/qtwebview.nix { }; 85 86 86 87 wrapQtAppsHook = makeSetupHook { 87 - deps = [ makeWrapper ]; 88 + deps = [ buildPackages.makeWrapper ]; 88 89 } ./hooks/wrap-qt-apps-hook.sh; 89 90 }; 90 91
+4
pkgs/top-level/all-packages.nix
··· 20288 20288 inherit bison cups dconf harfbuzz libGL perl gtk3; 20289 20289 inherit (gst_all_1) gstreamer gst-plugins-base; 20290 20290 inherit darwin; 20291 + inherit buildPackages; 20291 20292 stdenv = if stdenv.cc.isGNU 20292 20293 then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) 20293 20294 else stdenv; ··· 20300 20301 inherit bison cups dconf harfbuzz libGL perl gtk3; 20301 20302 inherit (gst_all_1) gstreamer gst-plugins-base; 20302 20303 inherit darwin; 20304 + inherit buildPackages; 20303 20305 stdenv = if stdenv.cc.isGNU 20304 20306 then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) 20305 20307 else stdenv; ··· 20312 20314 inherit bison cups dconf harfbuzz libGL perl gtk3; 20313 20315 inherit (gst_all_1) gstreamer gst-plugins-base; 20314 20316 inherit darwin; 20317 + inherit buildPackages; 20315 20318 }); 20316 20319 20317 20320 libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { ··· 20345 20348 inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; 20346 20349 inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; 20347 20350 inherit (gst_all_1) gstreamer gst-plugins-base; 20351 + inherit buildPackages; 20348 20352 cmake = cmake.overrideAttrs (attrs: { 20349 20353 patches = attrs.patches ++ [ 20350 20354 ../development/libraries/qt-6/cmake.patch