pkgs/tools: pkgconfig -> pkg-config (2)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
|
||||
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
|
||||
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
|
||||
, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
|
||||
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
|
||||
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection intltool pkgconfig pythonPackages.cython
|
||||
gobject-introspection intltool pkg-config pythonPackages.cython
|
||||
pythonPackages.wrapPython wrapGAppsHook
|
||||
autoreconfHook # drop when below patch is removed
|
||||
];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, alsaLib, bluez, glib, sbc, dbus
|
||||
|
||||
# optional, but useful utils
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
alsaLib bluez glib sbc dbus
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, autoreconfHook, readline
|
||||
, fetchFromGitHub, glib, pkgconfig }:
|
||||
, fetchFromGitHub, glib, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
date = "2016-12-12";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
buildInputs = [ readline glib ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "obex-data-server-0.4.6";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ];
|
||||
|
||||
patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "obexd-0.48";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ glib dbus openobex bluez libical ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.bluez.org/";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "obexfs-0.12";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse obexftp bluez ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "obexftp-0.24.2";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [ bluez ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openobex-1.7.2";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ bluez libusb-compat-0_1 ];
|
||||
|
||||
configureFlags = [ "--enable-apps" ];
|
||||
|
||||
Reference in New Issue
Block a user