Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions pkgs/development/libraries/qt-5/5.15/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,7 @@
fetchpatch,
fetchFromGitHub,
makeSetupHook,
makeWrapper,
bison,
cups ? null,
harfbuzz,
libGL,
perl,
python3,
gstreamer,
gst-plugins-base,
gtk3,
dconf,
llvmPackages_19,
darwin,

Expand Down Expand Up @@ -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;
};

Expand All @@ -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 { };
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/libraries/qt-5/modules/qtbase.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
withGtk3 ? false,
dconf,
gtk3,
withQttranslation ? true,
qttranslations ? null,
withLibinput ? false,
libinput,
Expand Down Expand Up @@ -492,8 +491,7 @@ stdenv.mkDerivation (
"-I"
"${libmysqlclient}/include"
]
++ lib.optional (withQttranslation && (qttranslations != null)) [
# depends on x11
++ lib.optional (qttranslations != null) [
"-translationdir"
"${qttranslations}/translations"
]
Expand Down
25 changes: 13 additions & 12 deletions pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
qtdeclarative,
pkg-config,
alsa-lib,
gstreamer,
gst-plugins-base,
gst_all_1,
libpulseaudio,
wayland,
}:
Expand All @@ -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"
Expand Down
30 changes: 1 addition & 29 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading