Unverified Commit 50bac937 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

qt5: simplify package functions' definitions and calls (#492070)

parents aed90839 81983341

pkgs/development/libraries/qt-5/5.15/default.nix

+1 −20
Original line number Diff line number Diff line
@@ -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 { };

pkgs/development/libraries/qt-5/modules/qtbase.nix

+1 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
  withGtk3 ? false,

  dconf,

  gtk3,

  withQttranslation ? true,

  qttranslations ? null,

  withLibinput ? false,

  libinput,
@@ -492,8 +491,7 @@ stdenv.mkDerivation ( 
            "-I"

            "${libmysqlclient}/include"

          ]

          ++ lib.optional (withQttranslation && (qttranslations != null)) [

            # depends on x11

          ++ lib.optional (qttranslations != null) [

            "-translationdir"

            "${qttranslations}/translations"

          ]

pkgs/development/libraries/qt-5/modules/qtmultimedia.nix

+13 −12
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
  qtdeclarative,

  pkg-config,

  alsa-lib,

  gstreamer,

  gst-plugins-base,

  gst_all_1,

  libpulseaudio,

  wayland,

}:
@@ -19,7 +18,9 @@ qtModule { 
    qtdeclarative

  ];

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [

  buildInputs =

    with gst_all_1;

    [

      gstreamer

      gst-plugins-base

    ]

pkgs/top-level/all-packages.nix

+1 −29
Original line number Diff line number Diff line
@@ -7374,35 +7374,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 {