diff options
| -rw-r--r-- | pkgs/default.nix | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index aa8de7c..4713d6c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -16,33 +16,39 @@ with prev; let ) ) ]; + + recursiveMerge = builtins.foldl' (acc: attr: acc // attr) {}; in - imported - // { - clang-tidy-sarif = callPackage ./clang-tidy-sarif.nix {inherit (final) clang-tidy-sarif;}; - clippy-sarif = callPackage ./clippy-sarif.nix {inherit (final) clippy-sarif;}; - hadolint-sarif = callPackage ./hadolint-sarif.nix {inherit (final) hadolint-sarif;}; - sarif-fmt = callPackage ./sarif-fmt.nix {inherit (final) sarif-fmt;}; - shellcheck-sarif = callPackage ./shellcheck-sarif.nix {inherit (final) shellcheck-sarif;}; - - klassy = libsForQt5.callPackage ./klassy.nix {}; - - modrinth-app-unwrapped = callPackage ./modrinth-app { - inherit (final.nodePackages or prev.nodePackages) pnpm; - - inherit - ((final.darwin or prev.darwin).apple_sdk.frameworks) - AppKit - CoreServices - Security - WebKit - ; - }; - - modrinth-app = callPackage ./modrinth-app/wrapper.nix { - inherit (final) modrinth-app-unwrapped; - }; - } - // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { - tcmalloc-tf2 = gperftools.override {inherit (pkgsi686Linux.llvmPackages_16) stdenv;}; - } + recursiveMerge [ + imported + + { + clang-tidy-sarif = callPackage ./clang-tidy-sarif.nix {inherit (final) clang-tidy-sarif;}; + clippy-sarif = callPackage ./clippy-sarif.nix {inherit (final) clippy-sarif;}; + hadolint-sarif = callPackage ./hadolint-sarif.nix {inherit (final) hadolint-sarif;}; + sarif-fmt = callPackage ./sarif-fmt.nix {inherit (final) sarif-fmt;}; + shellcheck-sarif = callPackage ./shellcheck-sarif.nix {inherit (final) shellcheck-sarif;}; + + klassy = libsForQt5.callPackage ./klassy.nix {}; + + modrinth-app-unwrapped = callPackage ./modrinth-app { + inherit (final.nodePackages or prev.nodePackages) pnpm; + + inherit + ((final.darwin or prev.darwin).apple_sdk.frameworks) + AppKit + CoreServices + Security + WebKit + ; + }; + + modrinth-app = callPackage ./modrinth-app/wrapper.nix { + inherit (final) modrinth-app-unwrapped; + }; + } + + (lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + tcmalloc-tf2 = gperftools.override {inherit (pkgsi686Linux.llvmPackages_16) stdenv;}; + }) + ] |