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

subversion: Split into multiple outputs

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2015-10-18 14:20:14 +03:00 committed by Vladimír Čunát
parent 44742f836d
commit c471cb866f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/version-management/subversion/default.nix
View File

@ -38,6 +38,9 @@ stdenv.mkDerivation (rec {
inherit (config.${branch}) sha1; inherit (config.${branch}) sha1;
}; };
# Can't do separate $lib and $bin, as libs reference bins
outputs = [ "dev" "out" "man" ];
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional pythonBindings python
@ -77,6 +80,12 @@ stdenv.mkDerivation (rec {
mkdir -p $out/share/bash-completion/completions mkdir -p $out/share/bash-completion/completions
cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
for f in $out/lib/*.la; do
substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib"
substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib"
substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib"
done
''; '';
inherit perlBindings pythonBindings; inherit perlBindings pythonBindings;

2
pkgs/tools/package-management/nix-prefetch-scripts/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial}
copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git}
copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion.out}
copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}
copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}
copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin} copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin}