qt5: simplify package functions' definitions and calls
Rely on callPackage whenever possible.
This commit is contained in:
@@ -16,17 +16,7 @@
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
makeSetupHook,
|
||||
makeWrapper,
|
||||
bison,
|
||||
cups ? null,
|
||||
harfbuzz,
|
||||
libGL,
|
||||
perl,
|
||||
python3,
|
||||
gstreamer,
|
||||
gst-plugins-base,
|
||||
gtk3,
|
||||
dconf,
|
||||
llvmPackages_19,
|
||||
darwin,
|
||||
|
||||
@@ -282,14 +272,7 @@ let
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
patches = patches.qtbase;
|
||||
inherit
|
||||
bison
|
||||
cups
|
||||
harfbuzz
|
||||
libGL
|
||||
;
|
||||
withGtk3 = !stdenv.hostPlatform.isDarwin;
|
||||
inherit dconf gtk3;
|
||||
inherit developerBuild decryptSslTraffic;
|
||||
};
|
||||
|
||||
@@ -305,9 +288,7 @@ let
|
||||
qtlocation = callPackage ../modules/qtlocation.nix { };
|
||||
qtlottie = callPackage ../modules/qtlottie.nix { };
|
||||
qtmacextras = callPackage ../modules/qtmacextras.nix { };
|
||||
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
||||
inherit gstreamer gst-plugins-base;
|
||||
};
|
||||
qtmultimedia = callPackage ../modules/qtmultimedia.nix { };
|
||||
qtnetworkauth = callPackage ../modules/qtnetworkauth.nix { };
|
||||
qtpim = callPackage ../modules/qtpim.nix { };
|
||||
qtpositioning = callPackage ../modules/qtpositioning.nix { };
|
||||
|
||||
@@ -6,8 +6,7 @@
|
||||
qtdeclarative,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
gstreamer,
|
||||
gst-plugins-base,
|
||||
gst_all_1,
|
||||
libpulseaudio,
|
||||
wayland,
|
||||
}:
|
||||
@@ -19,16 +18,18 @@ qtModule {
|
||||
qtdeclarative
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]
|
||||
# https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libpulseaudio
|
||||
alsa-lib
|
||||
wayland
|
||||
];
|
||||
buildInputs =
|
||||
with gst_all_1;
|
||||
[
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]
|
||||
# https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libpulseaudio
|
||||
alsa-lib
|
||||
wayland
|
||||
];
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
|
||||
@@ -7376,35 +7376,7 @@ with pkgs;
|
||||
python3 = null;
|
||||
};
|
||||
|
||||
qt5 = recurseIntoAttrs (
|
||||
makeOverridable (import ../development/libraries/qt-5/5.15) {
|
||||
inherit (__splicedPackages)
|
||||
makeScopeWithSplicing'
|
||||
generateSplicesForMkScope
|
||||
lib
|
||||
stdenv
|
||||
gcc14Stdenv
|
||||
fetchurl
|
||||
fetchpatch
|
||||
fetchgit
|
||||
fetchFromGitHub
|
||||
makeSetupHook
|
||||
makeWrapper
|
||||
bison
|
||||
cups
|
||||
dconf
|
||||
harfbuzz
|
||||
libGL
|
||||
perl
|
||||
gtk3
|
||||
python3
|
||||
llvmPackages_19
|
||||
darwin
|
||||
;
|
||||
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit config;
|
||||
}
|
||||
);
|
||||
qt5 = recurseIntoAttrs (__splicedPackages.callPackage ../development/libraries/qt-5/5.15 { });
|
||||
|
||||
libsForQt5 = recurseIntoAttrs (
|
||||
import ./qt5-packages.nix {
|
||||
|
||||
Reference in New Issue
Block a user