From b16bfb93cee157ada3b772441d0766e7406f93e0 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Fri, 11 Aug 2023 23:05:35 +0100
Subject: [PATCH] treewide: hack/nixpkgs, which uses _our_ nixpkgs, not actual
 nixpkgs

---
 hack/nixpkgs/default.nix  | 5 +++++
 nix/gitlab-ci/default.nix | 4 ++--
 ops/nixos/lib/common.nix  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 hack/nixpkgs/default.nix

diff --git a/hack/nixpkgs/default.nix b/hack/nixpkgs/default.nix
new file mode 100644
index 0000000000..6be0795594
--- /dev/null
+++ b/hack/nixpkgs/default.nix
@@ -0,0 +1,5 @@
+{ system ? builtins.currentSystem }@args:
+let
+  depot = import ../.. args;
+in
+  depot.pkgs
diff --git a/nix/gitlab-ci/default.nix b/nix/gitlab-ci/default.nix
index 6eac750d09..38930784af 100644
--- a/nix/gitlab-ci/default.nix
+++ b/nix/gitlab-ci/default.nix
@@ -65,7 +65,7 @@ let
       only.refs = [ "branch/default" ];
 
       script = ''
-        export NIX_PATH=nixpkgs=$(readlink -f third_party/nixpkgs)
+        export NIX_PATH=nixpkgs=$(readlink -f hack/nixpkgs)
         $(nix-build -A nix.pkgs.flipperzero-firmware.upload)/bin/upload-f0
       '';
     };
@@ -76,7 +76,7 @@ let
       only.refs = [ "branch/default" ];
 
       script = ''
-        export NIX_PATH=nixpkgs=$(readlink -f third_party/nixpkgs)
+        export NIX_PATH=nixpkgs=$(readlink -f hack/nixpkgs)
         cd web/lukegbcom
         ./deploy.sh
       '';
diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index 6951be68c2..dc89b6d05b 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -115,7 +115,7 @@ in
 
     nix = {
       package = pkgs.nix_2_3;  # Use a working nix.
-      nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/third_party/nixpkgs/" ];
+      nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/hack/nixpkgs/" ];
       settings = {
         trusted-users = [ "root" "@wheel" "deployer" ];
         substituters = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];