swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 13:45:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177477 from dotlambda/wrapQtAppsHook-cross

Browse source 
libsForQt5.wrapQtAppsHook: fix cross
This commit is contained in:
Rick van Schijndel 2022-06-15 20:33:43 +02:00 committed by GitHub
parent a2af67230b 59182da0c7
commit 83fb2a5ec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 4 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/development/libraries/qt-6/default.nix
View file

@ -19,6 +19,7 @@
, gst-plugins-base , gst-plugins-base
, gtk3 , gtk3
, dconf , dconf
, buildPackages
# options # options
, developerBuild ? false , developerBuild ? false
@ -84,7 +85,7 @@ let
qtwebview = callPackage ./modules/qtwebview.nix { }; qtwebview = callPackage ./modules/qtwebview.nix { };
wrapQtAppsHook = makeSetupHook { wrapQtAppsHook = makeSetupHook {
deps = [ makeWrapper ]; deps = [ buildPackages.makeWrapper ];
} ./hooks/wrap-qt-apps-hook.sh; } ./hooks/wrap-qt-apps-hook.sh;
}; };

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

@ -20288,6 +20288,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;
@ -20300,6 +20301,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;
@ -20312,6 +20314,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 {
@ -20345,6 +20348,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText;
inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit buildPackages;
cmake = cmake.overrideAttrs (attrs: { cmake = cmake.overrideAttrs (attrs: {
patches = attrs.patches ++ [ patches = attrs.patches ++ [
../development/libraries/qt-6/cmake.patch ../development/libraries/qt-6/cmake.patch