From 15833516a4bad0a4ae7786293b22df4bf650aa80 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 5 Feb 2019 16:42:45 -0500
Subject: [PATCH] Add armv6l-linux & armv7l-linux as cross jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cheap way to get 32-bit ARM working. We don’t support it
officially but lots of people have raspberry pis and similar hardware
they want to install the Nix package manager on.
---
 release.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/release.nix b/release.nix
index 271645067..0ec742906 100644
--- a/release.nix
+++ b/release.nix
@@ -2,6 +2,7 @@
 , nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09"; }
 , officialRelease ? false
 , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
+, crossSystems ? [ "armv6l-linux" "armv7l-linux" ]
 }:
 
 let
@@ -53,11 +54,12 @@ let
       };
 
 
-    build = pkgs.lib.genAttrs systems (system:
+    build = pkgs.lib.genAttrs (systems ++ crossSystems) (system:
 
-      let pkgs = import nixpkgs { inherit system; }; in
-
-      with pkgs;
+      let pkgs = if builtins.elem system systems
+                 then import nixpkgs { inherit system; }
+                 else import nixpkgs { crossSystem = { inherit system; }; };
+      in with pkgs;
 
       with import ./release-common.nix { inherit pkgs; };
 
@@ -89,9 +91,12 @@ let
       });
 
 
-    perlBindings = pkgs.lib.genAttrs systems (system:
+    perlBindings = pkgs.lib.genAttrs (systems ++ crossSystems) (system:
 
-      let pkgs = import nixpkgs { inherit system; }; in with pkgs;
+      let pkgs = if builtins.elem system systems
+                 then import nixpkgs { inherit system; }
+                 else import nixpkgs { crossSystem = { inherit system; }; };
+      in with pkgs;
 
       releaseTools.nixBuild {
         name = "nix-perl";
@@ -112,9 +117,12 @@ let
       });
 
 
-    binaryTarball = pkgs.lib.genAttrs systems (system:
+    binaryTarball = pkgs.lib.genAttrs (systems ++ crossSystems) (system:
 
-      with import nixpkgs { inherit system; };
+      let pkgs = if builtins.elem system systems
+                 then import nixpkgs { inherit system; }
+                 else import nixpkgs { crossSystem = { inherit system; }; };
+      in with pkgs;
 
       let
         toplevel = builtins.getAttr system jobs.build;