Commit dbd31d47 authored by Emily's avatar Emily
Browse files

subversion: remove obsolete Darwin cruft 

It builds fine without any of this.
parent 3d4bb1b3

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

+3 −19
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ assert pythonBindings -> swig != null && python3 != null && py3c != null; 
assert javahlBindings -> jdk != null && perl != null;



let

  # Update libtool for macOS 11 support

  needsAutogen =

    stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11";



  common =

    {

      version,
@@ -64,7 +60,7 @@ let 
          "man"

        ];



        nativeBuildInputs = lib.optionals needsAutogen [

        nativeBuildInputs = [

          autoconf

          libtool

          python3
@@ -86,11 +82,7 @@ let 
            py3c

          ]

          ++ lib.optional perlBindings perl

          ++ lib.optional saslSupport sasl

          ++ lib.optionals stdenv.hostPlatform.isDarwin [

            CoreServices

            Security

          ];

          ++ lib.optional saslSupport sasl;



        patches = [ ./apr-1.patch ] ++ extraPatches;
@@ -105,15 +97,7 @@ let 
        # "-P" CPPFLAG is needed to build Python bindings and subversionClient

        CPPFLAGS = [ "-P" ];



        env = lib.optionalAttrs stdenv.cc.isClang {

          NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [

            "-Wno-error=implicit-function-declaration"

            "-Wno-error=implicit-int"

            "-Wno-int-conversion"

          ];

        };



        preConfigure = lib.optionalString needsAutogen ''

        preConfigure = ''

          ./autogen.sh

        '';