From ac0c49970b7356d9fc4ccaeeed69a44705bf23b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jan 2016 21:25:08 +0100
Subject: [PATCH] make-tarball.nix: Allow passing in a different Nix

Used by the Nix tests (https://github.com/NixOS/nix/commit/9fff4925613d44ac12775ad8840709130b9498d1).
---
 pkgs/top-level/make-tarball.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index c14f94d95fd7..ebf19af943f5 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -2,7 +2,11 @@
    also builds the documentation and tests whether the Nix expressions
    evaluate correctly. */
 
-{ pkgs, nixpkgs, officialRelease }:
+{ nixpkgs
+, officialRelease
+, pkgs ? import nixpkgs.outPath {}
+, nix ? pkgs.nix
+}:
 
 with pkgs;