From 11a95310d117d28baa9693f6fc129f46761424a3 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 19 Feb 2026 19:31:30 +0100
Subject: [PATCH] subversion*: move env variables into env for structuredAttrs

---
 .../version-management/subversion/default.nix | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 4e19564295cd..adf079a84f4b 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -90,10 +90,18 @@ let
           rm subversion/bindings/swig/proxy/{perlrun.swg,pyrun.swg,python.swg,rubydef.swg,rubyhead.swg,rubytracking.swg,runtime.swg,swigrun.swg}
         '';
 
-        # We are hitting the following issue even with APR 1.6.x
-        # -> https://issues.apache.org/jira/browse/SVN-4813
-        # "-P" CPPFLAG is needed to build Python bindings and subversionClient
-        CPPFLAGS = [ "-P" ];
+        env = {
+          # We are hitting the following issue even with APR 1.6.x
+          # -> https://issues.apache.org/jira/browse/SVN-4813
+          # "-P" CPPFLAG is needed to build Python bindings and subversionClient
+          CPPFLAGS = toString [ "-P" ];
+        }
+        // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+          CXX = "clang++";
+          CC = "clang";
+          CPP = "clang -E";
+          CXXCPP = "clang++ -E";
+        };
 
         preConfigure = ''
           ./autogen.sh
@@ -167,13 +175,6 @@ let
           maintainers = with lib.maintainers; [ lovek323 ];
           platforms = lib.platforms.linux ++ lib.platforms.darwin;
         };
-
-      }
-      // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-        CXX = "clang++";
-        CC = "clang";
-        CPP = "clang -E";
-        CXXCPP = "clang++ -E";
       }
     );