diff options
author | Emery Hemingway <ehmry@posteo.net> | 2023-10-30 22:17:59 +0000 |
---|---|---|
committer | Emery Hemingway <ehmry@posteo.net> | 2023-11-28 16:48:10 +0200 |
commit | 35f108c7d7742fc9119a03783f40dd44cf7f6251 (patch) | |
tree | 01474278a90b96e73560628d9fe47a8c09c121b5 /pkgs/top-level | |
parent | 39d4eace911f9e838df023ad80f52132380e01c2 (diff) |
buildNimPackage: load lockfiles and overrides
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/nim-overrides.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/nim-packages.nix | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b62acb50ae270..b0ccb0663e65f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16811,6 +16811,7 @@ with pkgs; nimPackages = recurseIntoAttrs nim1.pkgs; nim2Packages = recurseIntoAttrs nim2.pkgs; buildNimPackage = callPackage ../development/compilers/nim/build-nim-package.nix { }; + nimOverrides = callPackage ./nim-overrides.nix { }; nrpl = callPackage ../development/tools/nrpl { }; diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix new file mode 100644 index 0000000000000..cf7a14b18d7d9 --- /dev/null +++ b/pkgs/top-level/nim-overrides.nix @@ -0,0 +1,16 @@ +{ lib +, SDL2 +}: + +# The following is list of overrides that take three arguments each: +# - lockAttrs: - an attrset from a Nim lockfile, use this for making constraints on the locked library +# - finalAttrs: - final arguments to the depender package +# - prevAttrs: - preceding arguments to the depender package +{ + + sdl2 = lockAttrs: finalAttrs: + { buildInputs ? [ ], ... }: { + buildInputs = buildInputs ++ [ SDL2 ]; + }; + +} diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index ea3091237c13d..e60c8b416eade 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -7,7 +7,7 @@ lib.makeScope newScope (self: buildNimPackage = buildNimPackage.override { defaultNimVersion = if lib.versionAtLeast nim.version "2.0.0" then 2 else 1; - }; + } { }; asciigraph = callPackage ../development/nim-packages/asciigraph { }; |