Unverified Commit f2771de7 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

subversion*: move env variables into env for structuredAttrs (#492203)

parents 755a6cc9 7cc1f8c1

pkgs/applications/version-management/subversion/default.nix

+124 −125
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ let 
      sha256,

      extraPatches ? [ ],

    }:

    stdenv.mkDerivation (

      rec {

    stdenv.mkDerivation rec {

      inherit version;

      pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}";
@@ -90,10 +89,18 @@ let 
        rm subversion/bindings/swig/proxy/{perlrun.swg,pyrun.swg,python.swg,rubydef.swg,rubyhead.swg,rubytracking.swg,runtime.swg,swigrun.swg}

      '';



      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 = [ "-P" ];

        CPPFLAGS = toString [ "-P" ];

      }

      // lib.optionalAttrs stdenv.hostPlatform.isDarwin {

        CXX = "clang++";

        CC = "clang";

        CPP = "clang -E";

        CXXCPP = "clang++ -E";

      };



      preConfigure = ''

        ./autogen.sh
@@ -167,15 +174,7 @@ 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";

      }

    );

    };



in

{