aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix8
-rw-r--r--package.nix8
2 files changed, 8 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index 8f93127f7..792387da4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -152,8 +152,6 @@
}
);
- binaryTarball = nix: pkgs: pkgs.callPackage ./nix-support/binary-tarball.nix { inherit nix; };
-
overlayFor =
getStdenv: final: prev:
let
@@ -236,13 +234,11 @@
);
# Perl bindings for various platforms.
- perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.perl-bindings);
+ perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.perl-bindings);
# Binary tarball for various platforms, containing a Nix store
# with the closure of 'nix' package.
- binaryTarball = forAllSystems (
- system: binaryTarball nixpkgsFor.${system}.native.nix nixpkgsFor.${system}.native
- );
+ binaryTarball = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.binaryTarball);
# docker image with Lix inside
dockerImage = lib.genAttrs linux64BitSystems (system: self.packages.${system}.dockerImage);
diff --git a/package.nix b/package.nix
index f65611ea6..ef6f317e8 100644
--- a/package.nix
+++ b/package.nix
@@ -376,8 +376,6 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.unix;
};
- passthru.perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv; };
-
# Export the patched version of boehmgc.
# flake.nix exports that into its overlay.
passthru = {
@@ -509,5 +507,11 @@ stdenv.mkDerivation (finalAttrs: {
'';
}
);
+
+ perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv; };
+
+ binaryTarball = pkgs.callPackage ./nix-support/binary-tarball.nix {
+ nix = finalAttrs.finalPackage;
+ };
};
})