diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/applications/version-management | |
parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index e8f9078a839e9..076d5d5dfe011 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582"; }; - NIX_CFLAGS_COMPILE = [ "-I${apr}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; + NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; patchPhase = '' sed -i 's|/bin/cat|cat|' ./src/repository.cpp diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index b94978bb48812..a3301d8acffca 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/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 3a8df10f16617..7590ae743a377 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} - bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt}" --with-xml2-dir="${libxml2}" + bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}" bundle install --verbose --local --deployment diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index c2ad83a581ca4..e0c7030a762f0 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -43,14 +43,14 @@ let configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} + ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} --disable-keychain ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} - --with-zlib=${zlib} - --with-sqlite=${sqlite} + --with-zlib=${zlib.dev} + --with-sqlite=${sqlite.dev} ''; preBuild = '' |