diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-10 18:07:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-10 18:07:14 +0100 |
| commit | 66fe4af226cf09ed2659aac43bf38098d42d95a7 (patch) | |
| tree | 0773be7b3adb574bd3c5514ff4658d76fa99becd /pkgs/servers | |
| parent | c9f4d714fe4638ac939e3494ba4b781d59b6a549 (diff) | |
| parent | 5efc5a4ede9f07994f85fe8bec9d86d1943e4a11 (diff) | |
Merge recent staging
It's the version last built on Hydra, almost fully.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/amqp/qpid-cpp/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index c03ec8eb7f9a..adbf156730eb 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }: +{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }: stdenv.mkDerivation rec { name = "qpid-cpp-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w"; }; - buildInputs = [ cmake python boost libuuid ruby ]; + buildInputs = [ cmake python2 boost libuuid ruby ]; # the subdir managementgen wants to install python stuff in ${python} and # the installation tries to create some folders in /var |