b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libsForQt5.wrapQtAppsHook: fix cross

Browse source
This commit is contained in:
Robert Schütz 2022-06-13 06:36:31 +00:00
parent 286ac3ea65
commit 5344965f85
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/5.12/default.nix
View file

@ -19,6 +19,7 @@ top-level attribute to `top-level/all-packages.nix`.
, bison, cups ? null, harfbuzz, libGL, perl , bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf , gstreamer, gst-plugins-base, gtk3, dconf
, darwin , darwin
, buildPackages
# options # options
, developerBuild ? false , developerBuild ? false
@ -236,7 +237,7 @@ let
} ../hooks/qmake-hook.sh; } ../hooks/qmake-hook.sh;
wrapQtAppsHook = makeSetupHook { wrapQtAppsHook = makeSetupHook {
deps = [ self.qtbase.dev makeWrapper ] deps = [ self.qtbase.dev buildPackages.makeWrapper ]
++ lib.optional stdenv.isLinux self.qtwayland.dev; ++ lib.optional stdenv.isLinux self.qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh; } ../hooks/wrap-qt-apps-hook.sh;
}; };

3
pkgs/development/libraries/qt-5/5.14/default.nix
View file

@ -19,6 +19,7 @@ top-level attribute to `top-level/all-packages.nix`.
, bison, cups ? null, harfbuzz, libGL, perl , bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf , gstreamer, gst-plugins-base, gtk3, dconf
, darwin , darwin
, buildPackages
# options # options
, developerBuild ? false , developerBuild ? false
@ -234,7 +235,7 @@ let
} ../hooks/qmake-hook.sh; } ../hooks/qmake-hook.sh;
wrapQtAppsHook = makeSetupHook { wrapQtAppsHook = makeSetupHook {
deps = [ self.qtbase.dev makeWrapper ] deps = [ self.qtbase.dev buildPackages.makeWrapper ]
++ lib.optional stdenv.isLinux self.qtwayland.dev; ++ lib.optional stdenv.isLinux self.qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh; } ../hooks/wrap-qt-apps-hook.sh;
}; };

3
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -12,6 +12,7 @@ Check for any minor version changes.
, bison, cups ? null, harfbuzz, libGL, perl , bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf , gstreamer, gst-plugins-base, gtk3, dconf
, darwin , darwin
, buildPackages
# options # options
, developerBuild ? false , developerBuild ? false
@ -192,7 +193,7 @@ let
} ../hooks/qmake-hook.sh; } ../hooks/qmake-hook.sh;
wrapQtAppsHook = makeSetupHook { wrapQtAppsHook = makeSetupHook {
deps = [ self.qtbase.dev makeWrapper ] deps = [ self.qtbase.dev buildPackages.makeWrapper ]
++ lib.optional stdenv.isLinux self.qtwayland.dev; ++ lib.optional stdenv.isLinux self.qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh; } ../hooks/wrap-qt-apps-hook.sh;
}; };

3
pkgs/top-level/all-packages.nix
View file

@ -20277,6 +20277,7 @@ with pkgs;
inherit bison cups dconf harfbuzz libGL perl gtk3; inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin; inherit darwin;
inherit buildPackages;
stdenv = if stdenv.cc.isGNU stdenv = if stdenv.cc.isGNU
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
else stdenv; else stdenv;
@ -20289,6 +20290,7 @@ with pkgs;
inherit bison cups dconf harfbuzz libGL perl gtk3; inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin; inherit darwin;
inherit buildPackages;
stdenv = if stdenv.cc.isGNU stdenv = if stdenv.cc.isGNU
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
else stdenv; else stdenv;
@ -20301,6 +20303,7 @@ with pkgs;
inherit bison cups dconf harfbuzz libGL perl gtk3; inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin; inherit darwin;
inherit buildPackages;
}); });
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {