diff options
Diffstat (limited to 'pkgs/tools/X11')
31 files changed, 62 insertions, 62 deletions
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 4c9c0b66a505..4bddee68f826 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash , xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ronn ]; diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 9db666672d48..fc6f7752a3a4 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}: +{lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXinerama imlib2 ]; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8bd65ec2fc2c..706194cc0dd0 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,7 +16,7 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, help2man, makeWrapper , glib, libbsd , libX11, xorgserver, kmod, xf86videonouveau , nvidia_x11, virtualgl, libglvnd @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. buildInputs = [ libX11 glib libbsd kmod ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; + nativeBuildInputs = [ makeWrapper pkg-config help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 632fc844e5ed..adf43ae8c08d 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtk, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "dragon-drop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk ]; installPhase = '' diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index d737ba56ed86..75b5bc2356a1 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext , libXinerama, libXrandr, glib, cairo, xdotool }: let release = "20180821"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr glib cairo xdotool ]; diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index aed85f978cd5..144841209304 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkg-config, xorgproto, libXi }: stdenv.mkDerivation rec { pname = "ksuperkey"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst xorgproto libXi ]; meta = with lib; { diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 8521c1dbc29a..432193950cdd 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }: let version = "1.6.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtkmm2 ]; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index b685ba8cf42c..bb763962cebf 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo -, libpng, libtool, libxml2, pkgconfig, which, xorg +, libpng, libtool, libxml2, pkg-config, which, xorg , libtirpc }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig which + nativeBuildInputs = [ autoconf automake libtool pkg-config which xorg.gccmakedep xorg.imake ]; buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil xorg.libXcomposite xorg.libXdamage xorg.libXdmcp xorg.libXext xorg.libXfont2 diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 0ca2eb3de790..5cbcec63c59d 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, +{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox, imlib2, libstartup_notification, makeWrapper, libSM }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libglade libSM openbox imlib2 libstartup_notification makeWrapper diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index 4052bbc8a556..ae0e5b89a619 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, libX11 }: stdenv.mkDerivation { pname = "runningx"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index cb24859c1e2b..c1cef23a695b 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "screen-message"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gtk3 ]; # screen-message installs its binary in $(prefix)/games per default diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index f38aa2c2c187..adf3b3d9250c 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage -, libXext, libXinerama, libjpeg, giflib, pkgconfig +, libXext, libXinerama, libjpeg, giflib, pkg-config }: let buildInputs = [ xorgproto libX11 libXft libXcomposite libXdamage libXext - libXinerama libjpeg giflib pkgconfig + libXinerama libjpeg giflib pkg-config ]; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 73f94768bcd9..35305d44635f 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libvdpau }: +{ lib, stdenv, fetchurl, pkg-config, libvdpau }: stdenv.mkDerivation rec { pname = "vdpauinfo"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvdpau ]; meta = with lib; { diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 9247d0fe2e02..0a01a3dad5a4 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -2,7 +2,7 @@ , fetchurl , libX11 , glib -, pkgconfig +, pkg-config , libXmu }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix index 7f3bfbf75a43..4facc365c1ed 100644 --- a/pkgs/tools/X11/x11spice/default.nix +++ b/pkgs/tools/X11/x11spice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config , xorg, gtk2, spice, spice-protocol }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libxcb xorg.xcbutil xorg.utilmacros diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 7264311d2dd5..bd10127f729f 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, - autoreconfHook, pkgconfig }: + autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "x11vnc"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libXfixes xorg.xorgproto openssl xorg.libXdamage diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index ef0d04410bb0..0521b6f8b3b4 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }: +{ lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }: let version = "1.09"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXext libXi libXtst ]; meta = { diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index 1f3537d5b5ac..ec40e0b06db4 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: +{ lib, stdenv, fetchurl, gtk, pkg-config, procps, makeWrapper, ... }: stdenv.mkDerivation rec { pname = "xbindkeys-config"; version = "0.1.3"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk makeWrapper ]; src = fetchurl { diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 8c65845f8bd0..ba45442a4492 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, guile }: +{ lib, stdenv, fetchurl, pkg-config, libX11, guile }: let version = "1.8.7"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 guile ]; meta = { diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index ab9e0c345429..f8d4376017bd 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst xorgproto libXi ]; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 924557f62217..5779f5270f71 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: +{ lib, stdenv, fetchurl, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: stdenv.mkDerivation rec { pname = "xdotool"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ]; preBuild = '' diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 35f0d73ea0b7..08fa4f155624 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitLab, python3 -, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }: +, xlibsWrapper, xorg, libpulseaudio, pkg-config, patchelf, Security }: rustPlatform.buildRustPackage rec { pname = "xidlehook"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "050ihjhg33223x6pgvhqrjprx1clkj2x3jr6acf716vbwm3m0bmz"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; - nativeBuildInputs = [ pkgconfig patchelf python3 ]; + nativeBuildInputs = [ pkg-config patchelf python3 ]; postFixup = lib.optionalString stdenv.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 1e4cfc6e0c92..2f74db17c372 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: +{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }: stdenv.mkDerivation rec { pname = "xinput_calibrator"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 2c63e5fd4fc8..35db8a133a23 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -1,4 +1,4 @@ -{ xorg, lib, stdenv, libev, fetchFromGitHub, pkgconfig }: +{ xorg, lib, stdenv, libev, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { pname = "xmousepasteblock"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; makeFlags = "PREFIX=$(out)"; buildInputs = with xorg; [ libX11 libXext libXi libev ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; homepage = "https://github.com/milaq/XMousePasteBlock"; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 75f4956651e7..c3355b802633 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst -, gtk2, libXi, pkgconfig, texinfo }: +, gtk2, libXi, pkg-config, texinfo }: stdenv.mkDerivation rec { version = "3.19"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 xorgproto libXext libXtst gtk2 - libXi pkgconfig + libXi pkg-config texinfo ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index f7e64ca3d7e7..0c1accd36fbd 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText +{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 @@ -50,7 +50,7 @@ in buildPythonApplication rec { substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index dadbfd01cb9b..9e7b85f6ef99 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib - , autoconf, automake, libtool, gettext, pkgconfig + , autoconf, automake, libtool, gettext, pkg-config , git, perl, texinfo, help2man }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake gettext git gnulib - help2man libtool perl pkgconfig texinfo + help2man libtool perl pkg-config texinfo ]; configurePhase = '' diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 945f21c8cb10..e2b87e7380c1 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xorg, pkgconfig, ncurses }: +{ lib, stdenv, fetchurl, xorg, pkg-config, ncurses }: stdenv.mkDerivation { pname = "xrestop"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ]; meta = { diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 99d695df2674..5c43dc6dff4a 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver , pam, apacheHttpd, pamtester, xscreensaver }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; buildInputs = [ libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 55262125fadb..0bb1e5172ff4 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }: stdenv.mkDerivation rec { pname = "xsettingsd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./SConstruct.patch ]; - nativeBuildInputs = [ scons pkgconfig ]; + nativeBuildInputs = [ scons pkg-config ]; buildInputs = [ libX11 ]; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 553a4c2b7ede..81cefb01c7f7 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: +{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gtk2 libXdamage ]; meta = { |