diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
commit | c4661e96434118637a5c41511a6c7f015726396f (patch) | |
tree | edd7a4026fd903cddfb32b27f629af7f5c110fa8 /pkgs/applications/version-management/subversion | |
parent | bfd522da633bd904918a939b29f0a0ebb594fa6b (diff) | |
parent | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (diff) | |
download | nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.gz nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.bz2 nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.lz nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.xz nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.zst nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.zip |
Merge: make dev output references explicit
This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
Diffstat (limited to 'pkgs/applications/version-management/subversion')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index c0131ef9620..0a5b2c0d74b 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -39,14 +39,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 = '' |