diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8e04700b83fd..fd990baa6faf 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -26,7 +26,7 @@ still shows most of the available features is in `./gwenview`. */ { - lib, libsForQt5, fetchurl, + lib, config, libsForQt5, fetchurl, }: let @@ -96,7 +96,6 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; itinerary = callPackage ./itinerary.nix {}; juk = callPackage ./juk.nix {}; - k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; @@ -264,6 +263,8 @@ let qmlkonsole = callPackage ./qmlkonsole.nix {}; telly-skout = callPackage ./telly-skout.nix {}; tokodon = callPackage ./tokodon.nix {}; + } // lib.optionalAttrs config.allowAliases { + k3b = throw "libsForQt5.k3b has been dropped in favor of kdePackages.k3b"; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix deleted file mode 100644 index 643c5e80b10f..000000000000 --- a/pkgs/applications/kde/k3b.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ mkDerivation, lib -, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info -, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui -, flac, lame, libmad, libmpcdec, libvorbis -, libsamplerate, libsndfile, taglib -, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit -}: - -mkDerivation { - pname = "k3b"; - meta = with lib; { - homepage = "https://apps.kde.org/k3b/"; - description = "Disk burning application"; - mainProgram = "k3b"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ sander ]; - platforms = platforms.linux; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - buildInputs = [ - # kde - libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui - # formats - flac lame libmad libmpcdec libvorbis - # sound utilities - libsamplerate libsndfile taglib - # cd/dvd - cdparanoia libdvdcss libdvdread - # others - ffmpeg libmusicbrainz3 shared-mime-info - ]; - propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; - postFixup = - let - binPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager flac - ]; - libraryPath = lib.makeLibraryPath [ - cdparanoia - ]; - in '' - wrapProgram "$out/bin/k3b" \ - --prefix PATH : "${binPath}" \ - --prefix LD_LIBRARY_PATH : ${libraryPath} - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3aa1e178d9e..77010018b53b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10767,7 +10767,7 @@ with pkgs; }); libsForQt5 = (recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; + inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; })) // { __recurseIntoDerivationForReleaseJobs = true; }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c1ac5b0f52ee..a93ce68cdfb5 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -7,6 +7,7 @@ { lib +, config , __splicedPackages , makeScopeWithSplicing' , generateSplicesForMkScope @@ -47,7 +48,7 @@ makeScopeWithSplicing' { kdeGear = let mkGear = import ../applications/kde; attrs = { - inherit libsForQt5; + inherit config libsForQt5; inherit (pkgs) lib fetchurl; }; in (lib.makeOverridable mkGear attrs);