subversion: Split into multiple outputs

Changed files
+10 -1
pkgs
applications
version-management
subversion
tools
package-management
nix-prefetch-scripts
+9
pkgs/applications/version-management/subversion/default.nix
···
inherit (config.${branch}) sha1;
};
buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python
···
mkdir -p $out/share/bash-completion/completions
cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
'';
inherit perlBindings pythonBindings;
···
inherit (config.${branch}) sha1;
};
+
# Can't do separate $lib and $bin, as libs reference bins
+
outputs = [ "dev" "out" "man" ];
+
buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python
···
mkdir -p $out/share/bash-completion/completions
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;
+1 -1
pkgs/tools/package-management/nix-prefetch-scripts/default.nix
···
copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial}
copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git}
-
copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion}
copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}
copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}
copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin}
···
copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial}
copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git}
+
copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion.out}
copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}
copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}
copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin}