From ecbb9c15c30af316fa263ba16a6f35dd78b37222 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Wed, 5 Jul 2017 08:46:22 +0930
Subject: [PATCH] rpi2.nix: pkgs.platforms.raspberrypi2 is no longer correct

---
 raspberry_pi/rpi2.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/raspberry_pi/rpi2.nix b/raspberry_pi/rpi2.nix
index 5744885..897871e 100644
--- a/raspberry_pi/rpi2.nix
+++ b/raspberry_pi/rpi2.nix
@@ -20,7 +20,7 @@ In fact I (viric) created the FS into a NBD, not a real SD, to create this image
 
 */
 
-{pkgs, config, ...}:
+{ pkgs, config, lib, ...}:
 
 {
   boot.consoleLogLevel = 7;
@@ -49,10 +49,16 @@ In fact I (viric) created the FS into a NBD, not a real SD, to create this image
   services.nixosManual.enable = false;
 
   nixpkgs.config = {
-    platform = pkgs.platforms.raspberrypi2;
+    # Since https://github.com/NixOS/nixpkgs/commit/f0b634c7e838cdd65ac6f73933c99af3f38d0fa8
+    nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;
+    # Earlier than that, use this:
+    # platform = pkgs.platforms.raspberrypi2;
+    # Also be aware of this issue if you're encountering infinite recursion:
+    # https://github.com/NixOS/nixpkgs/issues/24170
+
     allowUnfree = true;
   };
 
   nix.buildCores = 4;
   nix.binaryCaches = [ ];
-}
\ No newline at end of file
+}