diff options
Diffstat (limited to 'pkgs/applications/display-managers')
6 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 43f5bcd495a67..f595e211dc2b1 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 363e0503c2d6c..d1cd2e7d3e41c 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: +{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10hga7pmfyjdvj4xwm3djwrhk50brcpycj3p3c57pa0vnx4ill3s"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 29dece3e5cf7e..5c2a6d7c59b04 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib ]; postUnpack = if conf != "" then '' diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index ad74cbfb70352..6a96f560ddcb1 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,7 +4,7 @@ , substituteAll , plymouth , pam -, pkgconfig +, pkg-config , autoconf , automake , libtool @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { intltool itstool libtool - pkgconfig + pkg-config vala ]; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 6acb05478d8e5..90f7a03d0dd28 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -2,7 +2,7 @@ , lightdm_gtk_greeter , fetchurl , lightdm -, pkgconfig +, pkg-config , intltool , linkFarm , wrapGAppsHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index fd02536589fb7..f43d3ca9be387 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs +, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: @@ -27,7 +27,7 @@ in mkDerivation { sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd |