diff options
| -rw-r--r-- | overlay.nix | 65 |
1 files changed, 29 insertions, 36 deletions
diff --git a/overlay.nix b/overlay.nix index c4adcfb..1d65511 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,43 +1,36 @@ final: prev: let inherit (prev) lib callPackage; -in - lib.attrsets.mergeAttrsList [ - # files/directories are mapped to packages here for convenience sake - ( - let - toPkg = name: _: - lib.nameValuePair (lib.removeSuffix ".nix" name) (prev.callPackage ./pkgs/${name} {}); - in - lib.mapAttrs' toPkg (builtins.readDir ./pkgs) - ) - - { - clang-tidy-sarif = callPackage ./pkgs/clang-tidy-sarif.nix {inherit (final) clang-tidy-sarif;}; - clippy-sarif = callPackage ./pkgs/clippy-sarif.nix {inherit (final) clippy-sarif;}; - hadolint-sarif = callPackage ./pkgs/hadolint-sarif.nix {inherit (final) hadolint-sarif;}; - sarif-fmt = callPackage ./pkgs/sarif-fmt.nix {inherit (final) sarif-fmt;}; - shellcheck-sarif = callPackage ./pkgs/shellcheck-sarif.nix {inherit (final) shellcheck-sarif;}; - klassy = prev.libsForQt5.callPackage ./pkgs/klassy.nix {}; + # use `callPackage` on all expressions in a directory + pkgsFrom = dir: + lib.mapAttrs' ( + name: _: + lib.nameValuePair (lib.removeSuffix ".nix" name) (callPackage "${dir}/${name}" {}) + ) (builtins.readDir dir); +in + pkgsFrom ./pkgs + // { + clang-tidy-sarif = callPackage ./pkgs/clang-tidy-sarif.nix {inherit (final) clang-tidy-sarif;}; + clippy-sarif = callPackage ./pkgs/clippy-sarif.nix {inherit (final) clippy-sarif;}; + hadolint-sarif = callPackage ./pkgs/hadolint-sarif.nix {inherit (final) hadolint-sarif;}; + sarif-fmt = callPackage ./pkgs/sarif-fmt.nix {inherit (final) sarif-fmt;}; + shellcheck-sarif = callPackage ./pkgs/shellcheck-sarif.nix {inherit (final) shellcheck-sarif;}; - modrinth-app-unwrapped = callPackage ./pkgs/modrinth-app { - inherit (final.nodePackages) pnpm; + klassy = prev.libsForQt5.callPackage ./pkgs/klassy.nix {}; - inherit - (final.darwin.apple_sdk.frameworks) - AppKit - CoreServices - Security - WebKit - ; - }; + modrinth-app-unwrapped = callPackage ./pkgs/modrinth-app { + inherit (final.nodePackages) pnpm; - modrinth-app = callPackage ./pkgs/modrinth-app/wrapper.nix { - inherit (final) modrinth-app-unwrapped; - }; - } + inherit + (final.darwin.apple_sdk.frameworks) + AppKit + CoreServices + Security + WebKit + ; + }; - (lib.optionalAttrs (prev.stdenv.hostPlatform.system == "x86_64-linux") { - tcmalloc-tf2 = prev.gperftools.override {inherit (final.pkgsi686Linux.llvmPackages_16) stdenv;}; - }) - ] + modrinth-app = callPackage ./pkgs/modrinth-app/wrapper.nix { + inherit (final) modrinth-app-unwrapped; + }; + } |