diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
| commit | fc7bd322dfcd204ce6daa95285ff358999ff9a8d (patch) | |
| tree | 152ad62f3f30148a64a247fc583af45c80cab40c /pkgs/development/libraries/thrift/default.nix | |
| parent | 2d91ad963fe799fce74cf52d8d9ea2d4bc963a93 (diff) | |
| parent | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (diff) | |
| download | nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.gz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.bz2 nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.lz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.xz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.zst nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/libraries/thrift/default.nix')
| -rw-r--r-- | pkgs/development/libraries/thrift/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 6abddbbdbe5..5a9547a959f 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig +{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ cmake pkgconfig bison flex ]; + nativeBuildInputs = [ cmake pkg-config bison flex ]; buildInputs = [ boost zlib libevent openssl ] ++ stdenv.lib.optionals (!static) [ python twisted ]; |