diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 8af1ca90267..2c688ea71bd 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,4 +1,4 @@
-with (import ./release-lib.nix);
+with import ./release-lib.nix { supportedSystems = []; };
 let
   nativePlatforms = linux;
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 5b7e830a2f1..5052a41a96c 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,3 +1,5 @@
+{ supportedSystems }:
+
 rec {
 
   # Ensure that we don't build packages marked as unfree.
@@ -8,10 +10,6 @@ rec {
   pkgs = allPackages { system = "x86_64-linux"; };
 
 
-  # The platforms for which we build Nixpkgs.
-  supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
-
-
   /* !!! Hack: poor man's memoisation function.  Necessary to prevent
      Nixpkgs from being evaluated again and again for every
      job/platform pair. */
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ad027cd9346..a3902b8daa8 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -11,9 +11,11 @@
 
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
+, # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
 }:
 
-with import ./release-lib.nix;
+with import ./release-lib.nix { inherit supportedSystems; };
 
 let