jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of subversion is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:47:36 +03:00 committed by Vladimír Čunát
parent e80e4ba2bb
commit 05d8174b0e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/cluster/mesos/default.nix
View File

@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--sbindir=\${out}/bin" "--sbindir=\${out}/bin"
"--with-apr=${apr.dev}" "--with-apr=${apr.dev}"
"--with-svn=${subversion}" "--with-svn=${subversion.dev}"
"--with-leveldb=${leveldb}" "--with-leveldb=${leveldb}"
"--with-glog=${glog}" "--with-glog=${glog}"
"--with-glog=${glog}" "--with-glog=${glog}"

2
pkgs/applications/version-management/kdesvn/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
prePatch = '' 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 ]; buildInputs = [ apr aprutil subversion db kdelibs expat ];

2
pkgs/top-level/python-packages.nix
View File

@ -18670,7 +18670,7 @@ in modules // {
--apr-lib-dir=${pkgs.apr.out}/lib \ --apr-lib-dir=${pkgs.apr.out}/lib \
--svn-lib-dir=${pkgs.subversion.out}/lib \ --svn-lib-dir=${pkgs.subversion.out}/lib \
--svn-bin-dir=${pkgs.subversion.out}/bin \ --svn-bin-dir=${pkgs.subversion.out}/bin \
--svn-root-dir=${pkgs.subversion} --svn-root-dir=${pkgs.subversion.dev}
'' + (if !stdenv.isDarwin then "" else '' '' + (if !stdenv.isDarwin then "" else ''
sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile
''); '');