diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-05 13:13:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 13:13:21 +0200 |
| commit | e50c67ad7eefa8e77436fbd0366b69638b1c8713 (patch) | |
| tree | 0b5038414bb6f38e649f9eb53133d2fb2eca6c72 /pkgs/servers/amqp | |
| parent | df77ecc99d0ee7555bc6353e6eef592409d5d855 (diff) | |
| parent | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (diff) | |
| download | nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.gz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.bz2 nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.lz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.xz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.zst nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.zip | |
Merge pull request #83618 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/servers/amqp')
| -rw-r--r-- | pkgs/servers/amqp/qpid-cpp/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 02c2e03d90fa..4eb56ee4ae20 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: let - name = "qpid-cpp-${version}"; + pname = "qpid-cpp"; + name = "${pname}-${version}"; version = "1.39.0"; src = fetchurl { @@ -20,7 +21,7 @@ let }; qpid-cpp = stdenv.mkDerivation { - inherit src meta name; + inherit src meta pname version; nativeBuildInputs = [ cmake ]; buildInputs = [ boost libuuid ruby python2 ]; @@ -46,7 +47,7 @@ let }; python-frontend = buildPythonPackage { - inherit name meta src; + inherit pname version meta src; sourceRoot = "${name}/management/python"; |