diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/qt-6/modules | |
parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-6/modules')
4 files changed, 6 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index edf29ab8d36f..4b541ca6fec2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -203,9 +203,9 @@ stdenv.mkDerivation rec { # https://bugreports.qt.io/browse/QTBUG-97568 postPatch = '' - substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls" '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/QtAutoDetect.cmake --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" + substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index bd8c0983282b..a9660b73710b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,14 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.1"; + version = "6.6.2"; + src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-6jQrUT1wLk6rhDIns0ubdUCZ7e/m38Oqvl8c1/sfWxI="; + hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM="; }; + propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix index de13977304e2..b5f1c71fdd75 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,7 +4,6 @@ , wayland , pkg-config , libdrm -, fetchpatch }: qtModule { @@ -12,12 +11,4 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # Fix potential crash issues when some submenus are expanded - # https://codereview.qt-project.org/c/qt/qtwayland/+/519344/ - (fetchpatch { - url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=aae65c885d8e38d8abc2959cded7b5e9e5fc88b3"; - hash = "sha256-FD1VaiTgl9Z1y+5EDpWYShM1ULoFdET86FoFfqDmjyo="; - }) - ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 068c04b4c89e..64b5b9738caa 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -134,10 +134,6 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch - - # Cherry-pick libxml 2.12 build fix - # FIXME: remove for 6.7 - ../patches/qtwebengine-libxml-2.12.patch ]; postPatch = '' |