mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-19 02:44:17 +03:00
treewide: Make explicit that 'dev' output of subversion is used
This commit is contained in:
parent
e80e4ba2bb
commit
05d8174b0e
@ -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}"
|
||||
|
@ -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 ];
|
||||
|
@ -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
|
||||
'');
|
||||
|
Loading…
Reference in New Issue
Block a user