ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-04 03:27:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #220374 from Artturin/qt5splicing

Browse Source
This commit is contained in:
Artturi 2023-03-09 23:26:49 +02:00 committed by GitHub
commit eec92afc64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/no-x-libs.nix
View File

@ -61,7 +61,7 @@ with lib;
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
qt5 = super.qt5.overrideScope' (const (super': {
qt5 = super.qt5.overrideScope (const (super': {
qtbase = super'.qtbase.override { withGtk3 = false; };
}));
stoken = super.stoken.override { withGTK3 = false; };

7
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -7,7 +7,7 @@ Check for any minor version changes.
*/
{ newScope
{ makeScopeWithSplicing, generateSplicesForMkScope
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl, python3
, gstreamer, gst-plugins-base, gtk3, dconf
@ -119,6 +119,9 @@ let
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
in {
# remove before 23.11
overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith =
@ -225,4 +228,4 @@ let
} ../hooks/wrap-qt-apps-hook.sh;
};
in lib.makeScope newScope addPackages
in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages

13
pkgs/top-level/all-packages.nix
View File

@ -23058,12 +23058,11 @@ with pkgs;
qt5 = recurseIntoAttrs (makeOverridable
(import ../development/libraries/qt-5/5.15) {
inherit newScope;
inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3 python3;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit darwin;
inherit buildPackages;
inherit (__splicedPackages)
makeScopeWithSplicing generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
bison cups dconf harfbuzz libGL perl gtk3 python3
darwin buildPackages;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
});
@ -23073,7 +23072,7 @@ with pkgs;
# TODO: remove once no package needs this anymore or together with OpenSSL 1.1
# Current users: mumble, murmur
qt5_openssl_1_1 = qt5.overrideScope' (_: super: {
qt5_openssl_1_1 = qt5.overrideScope (_: super: {
qtbase = super.qtbase.override {
openssl = openssl_1_1;
libmysqlclient = libmysqlclient.override {