1 files changed, 13 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/nixpkgs/pkgs/applications/version-management/subversion/default.nix
index dffe3fadd74b..5540e53c84ed 100644
--- a/nixpkgs/pkgs/applications/version-management/subversion/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/subversion/default.nix
@@ -5,7 +5,7 @@
 , perlBindings ? false
 , javahlBindings ? false
 , saslSupport ? false
-, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
+, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
 , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
 , sasl ? null, serf ? null
 }:
@@ -31,10 +31,10 @@ let
 
     buildInputs = [ zlib apr aprutil sqlite openssl ]
       ++ extraBuildInputs
-      ++ stdenv.lib.optional httpSupport serf
-      ++ stdenv.lib.optional pythonBindings python
-      ++ stdenv.lib.optional perlBindings perl
-      ++ stdenv.lib.optional saslSupport sasl;
+      ++ lib.optional httpSupport serf
+      ++ lib.optional pythonBindings python
+      ++ lib.optional perlBindings perl
+      ++ lib.optional saslSupport sasl;
 
     patches = [ ./apr-1.patch ];
 
@@ -44,15 +44,15 @@ let
     CPPFLAGS = [ "-P" ];
 
     configureFlags = [
-      (stdenv.lib.withFeature bdbSupport "berkeley-db")
-      (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
-      (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
-      (stdenv.lib.withFeatureAs saslSupport "sasl" sasl)
-      (stdenv.lib.withFeatureAs httpSupport "serf" serf)
+      (lib.withFeature bdbSupport "berkeley-db")
+      (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
+      (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
+      (lib.withFeatureAs saslSupport "sasl" sasl)
+      (lib.withFeatureAs httpSupport "serf" serf)
       "--disable-keychain"
       "--with-zlib=${zlib.dev}"
       "--with-sqlite=${sqlite.dev}"
-    ] ++ stdenv.lib.optionals javahlBindings [
+    ] ++ lib.optionals javahlBindings [
       "--enable-javahl"
       "--with-jdk=${jdk}"
     ];
@@ -95,7 +95,7 @@ let
     checkInputs = [ python ];
     doCheck = false; # fails 10 out of ~2300 tests
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "A version control system intended to be a compelling replacement for CVS in the open source community";
       license = licenses.asl20;
       homepage = "http://subversion.apache.org/";
@@ -103,7 +103,7 @@ let
       platforms = platforms.linux ++ platforms.darwin;
     };
 
-  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+  } // lib.optionalAttrs stdenv.isDarwin {
     CXX = "clang++";
     CC = "clang";
     CPP = "clang -E";