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/os-specific/linux/conky | |
| 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/os-specific/linux/conky')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2df08dbb2b5..61b66c6c861 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake # dependencies , glib, libXinerama @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses |