diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2022-05-25 14:37:41 -0500 |
|---|---|---|
| committer | ehmry <ehmry@posteo.net> | 2022-06-10 11:01:59 -0500 |
| commit | c4182b8047a24630c9ef7dddf09bfb40ec2149cd (patch) | |
| tree | c4c1aae79313a1496b213b6a9628f5ae4e536d06 | |
| parent | 3f909fb574d9b9d7294e544981c62a4a5e4599fc (diff) | |
| download | nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.tar nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.tar.gz nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.tar.bz2 nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.tar.lz nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.tar.xz nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.tar.zst nixpkgs-c4182b8047a24630c9ef7dddf09bfb40ec2149cd.zip | |
buildNimPackage: use depsBuildBuild for nim_builder
| -rw-r--r-- | pkgs/development/nim-packages/build-nim-package/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/nim-packages.nix | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix index d32a9543cf2..46d898cc1d2 100644 --- a/pkgs/development/nim-packages/build-nim-package/default.nix +++ b/pkgs/development/nim-packages/build-nim-package/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, nim, nim_builder }: -{ strictDeps ? true, nativeBuildInputs ? [ ], configurePhase ? null -, buildPhase ? null, checkPhase ? null, installPhase ? null, meta ? { }, ... -}@attrs: +{ strictDeps ? true, depsBuildBuild ? [ ], nativeBuildInputs ? [ ] +, configurePhase ? null, buildPhase ? null, checkPhase ? null +, installPhase ? null, meta ? { }, ... }@attrs: stdenv.mkDerivation (attrs // { inherit strictDeps; - nativeBuildInputs = [ nim nim_builder ] ++ nativeBuildInputs; + depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; + nativeBuildInputs = [ nim ] ++ nativeBuildInputs; configurePhase = if isNull configurePhase then '' runHook preConfigure diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index e808ebef854..a666177a92f 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, newScope, nim, fetchFromGitHub }: +{ lib, pkgs, stdenv, newScope, nim, fetchFromGitHub, buildPackages }: lib.makeScope newScope (self: let callPackage = self.callPackage; @@ -6,7 +6,9 @@ lib.makeScope newScope (self: inherit nim; nim_builder = callPackage ../development/nim-packages/nim_builder { }; buildNimPackage = - callPackage ../development/nim-packages/build-nim-package { }; + callPackage ../development/nim-packages/build-nim-package { + inherit (buildPackages.buildPackages.nimPackages) nim_builder; + }; fetchNimble = callPackage ../development/nim-packages/fetch-nimble { }; astpatternmatching = |