summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEmery Hemingway <ehmry@posteo.net>2021-03-05 15:00:03 +0100
committerEmery Hemingway <ehmry@posteo.net>2021-03-26 11:36:38 +0100
commit56592ea2933c3ee837e28f593191924748db3142 (patch)
tree11a155b7551a7d2eb2a07b7fffe0089a10b4ab0e /pkgs/top-level
parentc8d2f4a3a888aa9f202b9d9660df14fee55994f6 (diff)
nim: cross-compilation fixes
* Import with callPackages * Use buildPackages for building a cross-compiler * Patch-out potential conflicts in nim.cfg * Generate a configuration with toolchain detection * Build with strictDeps enabled
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e502a21f217e..10a530825eca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10907,9 +10907,8 @@ in
muon = callPackage ../development/compilers/muon { };
- nim = callPackage ../development/compilers/nim { };
- nim-unwrapped = nim.unwrapped;
- nimble-unwrapped = nim.nimble-unwrapped;
+ inherit (callPackages ../development/compilers/nim { })
+ nim-unwrapped nimble-unwrapped nim;
nrpl = callPackage ../development/tools/nrpl { };