From a7892a28ec9395fbd5fd99aa09ed8de1206434be Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Thu, 25 Jan 2024 22:00:32 -0800
Subject: [PATCH] refer directly to stdenv since it's in scope

---
 flake.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index e10ea4ee..c9ef7914 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,7 +70,7 @@
               stdenv.hostPlatform.isStatic
               ["-C" "relocation-model=static"]
             ++ lib.optionals
-              (stdenv.buildPlatform.config != pkgs.stdenv.hostPlatform.config)
+              (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
               ["-l" "c"]
             ++ lib.optionals
               # This check has to match the one [here][0]. We only need to set
@@ -79,14 +79,13 @@
               #
               # [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39
               (
-                (pkgs.stdenv.hostPlatform.isAarch64
-                    # Nixpkgs doesn't check for x86_64 here but we do, because I
-                    # observed a failure building statically for x86_64 without
-                    # including it here. Linkers are weird.
-                    || pkgs.stdenv.hostPlatform.isx86_64)
-                  && pkgs.stdenv.hostPlatform.isStatic
-                  && !pkgs.stdenv.isDarwin
-                  && !pkgs.stdenv.cc.bintools.isLLVM
+                # Nixpkgs doesn't check for x86_64 here but we do, because I
+                # observed a failure building statically for x86_64 without
+                # including it here. Linkers are weird.
+                (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
+                  && stdenv.hostPlatform.isStatic
+                  && !stdenv.isDarwin
+                  && !stdenv.cc.bintools.isLLVM
               )
               [
                 "-l"