Unverified Commit e433609e authored by K900's avatar K900 Committed by GitHub
Browse files

kdePackages: nixfmt (#343189)

parents 6ad09ef4 a78ad9a8

pkgs/kde/default.nix

+75 −64
Original line number Diff line number Diff line
@@ -11,24 +11,35 @@ 
  wayland-protocols,

  wayland,

  zxing-cpp,

}: let

  allPackages = self: let

}:

let

  allPackages =

    self:

    let

      frameworks = import ./frameworks { inherit (self) callPackage; };

      gear = import ./gear { inherit (self) callPackage; };

      plasma = import ./plasma { inherit (self) callPackage; };



    sets = ["gear" "frameworks" "plasma"];

      sets = [

        "gear"

        "frameworks"

        "plasma"

      ];



      loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json");

      allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets);



    sources = lib.mapAttrs (_: v:

      sources = lib.mapAttrs (

        _: v:

        (fetchurl {

          inherit (v) url hash;

        })

      // {inherit (v) version;})

    allUrls;

  in (

        // {

          inherit (v) version;

        }

      ) allUrls;

    in

    (

      qt6Packages

      // frameworks

      // gear

pkgs/kde/frameworks/baloo/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -11,5 +11,8 @@ mkKdeDerivation { 
    substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition

  '';



  extraBuildInputs = [qtdeclarative lmdb];

  extraBuildInputs = [

    qtdeclarative

    lmdb

  ];

}

pkgs/kde/frameworks/default.nix

+74 −73
Original line number Diff line number Diff line 
{callPackage}: {

{ callPackage }:

{

  attica = callPackage ./attica { };

  baloo = callPackage ./baloo { };

  bluez-qt = callPackage ./bluez-qt { };

pkgs/kde/frameworks/extra-cmake-modules/default.nix

+3 −2
Original line number Diff line number Diff line 
{ mkKdeDerivation

, python3

{

  mkKdeDerivation,

  python3,

}:

mkKdeDerivation {

  pname = "extra-cmake-modules";

pkgs/kde/frameworks/karchive/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
mkKdeDerivation {

  pname = "karchive";



  extraNativeBuildInputs = [qttools pkg-config];

  extraNativeBuildInputs = [

    qttools

    pkg-config

  ];

  extraBuildInputs = [ xz ];

}