diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-31 11:46:46 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 11:46:46 +0000 |
| commit | ac5a927919638e6a9c69cd35084c7e7801472498 (patch) | |
| tree | 8df839983183262d486d639b0d6cae3ed042fcef /pkgs/data | |
| parent | 3c526dbe2cf8ef9f7d700f689f01531df6898b99 (diff) | |
| parent | 72152ff5ad470ed1a5b97c0ba2737938c136c994 (diff) | |
| download | nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.gz nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.bz2 nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.lz nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.xz nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.zst nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.zip | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts: pkgs/development/python-modules/einops/default.nix pkgs/development/python-modules/elegy/default.nix
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 9ac49167f66..a1bdef2639a 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -21,10 +21,9 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake libtool intltool ]; |