pkgs/applications: pkgconfig -> pkg-config
This commit is contained in:
committed by
Jonathan Ringer
parent
47e997598c
commit
5d566c43b4
@@ -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
|
||||
];
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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 ''
|
||||
|
||||
@@ -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
|
||||
];
|
||||
|
||||
|
||||
@@ -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 ]);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user