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/networking/cluster/mesos/default.nix | |
parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/applications/networking/cluster/mesos/default.nix')
-rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 7efd34dee563..89337901f97c 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure.ac \ - --replace /usr/include/libnl3 ${libnl}/include/libnl3 + --replace /usr/include/libnl3 ${libnl.dev}/include/libnl3 substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' @@ -94,17 +94,17 @@ in stdenv.mkDerivation rec { configureFlags = [ "--sbindir=\${out}/bin" - "--with-apr=${apr}" - "--with-svn=${subversion}" + "--with-apr=${apr.dev}" + "--with-svn=${subversion.dev}" "--with-leveldb=${leveldb}" "--with-glog=${glog}" "--with-glog=${glog}" "--enable-optimize" "--disable-python-dependency-install" "--enable-ssl" - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--enable-libevent" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" ]; |