diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-17 16:27:57 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-17 16:27:57 +0000 |
commit | 3aa99d803ee66dda1f515d24b008c38317ede0ed (patch) | |
tree | 277a1b7d04fdbc91441d3e23bb9fcfcbea066309 /pkgs/desktops/kde-4.8 | |
parent | dc9830111b0bb250475f7eac3b8f14d3d9207c63 (diff) |
Remove PATHS from find-svn.patch
svn path=/nixpkgs/trunk/; revision=31605
Diffstat (limited to 'pkgs/desktops/kde-4.8')
-rw-r--r-- | pkgs/desktops/kde-4.8/kdesdk/find-svn.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch index 61cb49b308f2c..f6f4df942dd9a 100644 --- a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch +++ b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch @@ -12,7 +12,7 @@ index 59bcb96..2eac05d 100644 if(SVNCONFIG_EXECUTABLE) -@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) +@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE) set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) else(APRCONFIG_EXECUTABLE) FIND_PATH(_INCLUDES apr_pools.h @@ -26,12 +26,11 @@ index 59bcb96..2eac05d 100644 - /usr/local/include/apr-1/ - /usr/local/include/apr-1.0/ + HINTS ${SVN_INCLUDES} -+ PATHS /usr /usr/local + SUFFIXES apr-0 apr-1 apr-1.0 ) if(_INCLUDES) set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) +@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE) set(SVN_FOUND FALSE) # no apr == can't compile! endif(_INCLUDES) endif(APRCONFIG_EXECUTABLE) @@ -45,7 +44,6 @@ index 59bcb96..2eac05d 100644 + else(APUCONFIG_EXECUTABLE) + FIND_PATH(_INCLUDES apu.h + HINTS ${SVN_INCLUDES} -+ PATHS /usr /usr/local + SUFFIXES apr-0 apr-1 apr-1.0 + ) + if(_INCLUDES) |