diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-19 12:43:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-19 12:43:52 +0000 |
commit | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (patch) | |
tree | 9d43a122bbf9f02687afad5b4b634bde310dbf5e /pkgs/development/libraries/hamlib/default.nix | |
parent | 896a18112460f3b7a67576dde0142cd37d6bab50 (diff) | |
parent | 7de82fbe61b3fd1854fc4a89a1ab4ed6fad812e3 (diff) | |
download | nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.gz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.bz2 nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.lz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.xz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.zst nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/hamlib/default.nix')
-rw-r--r-- | pkgs/development/libraries/hamlib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 8ef8b55be52..2c415b39df3 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb-compat-0_1 pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkg-config boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; |