From 1f5e0f60a7f70433f5df104f28a7a786ef352b0c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 17 Jun 2023 22:49:06 +0300
Subject: [PATCH 1/2] writers.makePythonWriter: fix interpreter executable

(cherry picked from commit 3ea5e8337304e65b77f0d56ca872ddac6516b970)
---
 pkgs/build-support/writers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 2c26f350fbd7..3016a45b8a0f 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -264,8 +264,8 @@ let
   makeScriptWriter {
     interpreter =
       if libraries == []
-      then "${python}/bin/python"
-      else "${python.withPackages (ps: libraries)}/bin/python"
+      then python.interpreter
+      else (python.withPackages (ps: libraries)).interpreter
     ;
     check = optionalString python.isPy3k (writeDash "pythoncheck.sh" ''
       exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"

From 753445f8f97dc8aa56434c44fe77c53eaec043be Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 17 Jun 2023 23:45:11 +0300
Subject: [PATCH 2/2] tests.stdenv.hooks.reproducible-builds: fix mistake

(cherry picked from commit 287960743168ac2984d524cc8ae9986950130154)
---
 pkgs/test/stdenv/hooks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix
index ba5da511c6fe..eb1b3f61bda6 100644
--- a/pkgs/test/stdenv/hooks.nix
+++ b/pkgs/test/stdenv/hooks.nix
@@ -115,7 +115,7 @@
     name = "test-reproducible-builds";
     buildCommand = ''
       # can't be tested more precisely because the value of random-seed changes depending on the output
-      [[ $env.NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
+      [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
       touch $out
     '';
   };