diff options
| -rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/kdesvn/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 05819d6c47a..89337901f97 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--sbindir=\${out}/bin" "--with-apr=${apr.dev}" - "--with-svn=${subversion}" + "--with-svn=${subversion.dev}" "--with-leveldb=${leveldb}" "--with-glog=${glog}" "--with-glog=${glog}" diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index b94978bb488..a3301d8acff 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; prePatch = '' - sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake + sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; buildInputs = [ apr aprutil subversion db kdelibs expat ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 573ad60d286..fce8075f7f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18670,7 +18670,7 @@ in modules // { --apr-lib-dir=${pkgs.apr.out}/lib \ --svn-lib-dir=${pkgs.subversion.out}/lib \ --svn-bin-dir=${pkgs.subversion.out}/bin \ - --svn-root-dir=${pkgs.subversion} + --svn-root-dir=${pkgs.subversion.dev} '' + (if !stdenv.isDarwin then "" else '' sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile ''); |