From d7fa631412f452888ae0a9cdc281d1023655e4db Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Mon, 11 Jan 2021 18:50:37 -0600 Subject: [PATCH 01/38] resholve: don't propagate, 0.4.0 -> 0.4.1 --- pkgs/development/misc/resholve/resholve.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 06561e05dd9..a03c604e330 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , callPackage , python27Packages , installShellFiles @@ -11,12 +11,12 @@ , doCheck ? true }: let - version = "0.4.0"; + version = "0.4.1"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-wfxcX3wMZqoi5bWjXYRa21UDDJmTDfE+21p4mL2IJog="; + hash = "sha256-VK7r+kdtWvS9d4B90Hq7fhLfWT/B/Y9zppvOX9tPt5g="; }; deps = callPackage ./deps.nix { /* @@ -55,7 +55,7 @@ python27Packages.buildPythonApplication { inherit doCheck; checkInputs = [ bats ]; - RESHOLVE_PATH = "${stdenv.lib.makeBinPath [ file findutils gettext ]}"; + RESHOLVE_PATH = "${lib.makeBinPath [ file findutils gettext ]}"; checkPhase = '' # explicit interpreter for test suite @@ -64,6 +64,12 @@ python27Packages.buildPythonApplication { ./test.sh ''; + # Do not propagate Python; may be obsoleted by nixos/nixpkgs#102613 + # for context on why, see abathur/resholve#20 + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + meta = with lib; { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; From 04f4d3afe333be3cb638f0ed17a89dabf9d4aafd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jan 2021 15:17:45 +0100 Subject: [PATCH 02/38] python3Packages.aioshelly: init at 0.5.3 --- .../python-modules/aioshelly/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/aioshelly/default.nix diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix new file mode 100644 index 00000000000..8f7e9ca9450 --- /dev/null +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -0,0 +1,34 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, netifaces +}: + +buildPythonPackage rec { + pname = "aioshelly"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "0177psqfib70vcvf3cg8plbwrilh770cqg8b547icdh5lnqv70b1"; + }; + + propagatedBuildInputs = [ + aiohttp + netifaces + ]; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "aioshelly" ]; + + meta = with lib; { + description = "Python library to control Shelly"; + homepage = "https://github.com/home-assistant-libs/aioshelly"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f902e97dbc3..8e406b4a4f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -266,6 +266,8 @@ in { aiorun = callPackage ../development/python-modules/aiorun { }; + aioshelly = callPackage ../development/python-modules/aioshelly { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; aiosqlite = callPackage ../development/python-modules/aiosqlite { }; From e22df4b526e4f83d5b6fcafe05f84e0c24728701 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jan 2021 15:18:35 +0100 Subject: [PATCH 03/38] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4487da38c4c..aef78adb751 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -722,7 +722,7 @@ "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiqpy "shell_command" = ps: with ps; [ ]; - "shelly" = ps: with ps; [ ]; # missing inputs: aioshelly + "shelly" = ps: with ps; [ aioshelly ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; From 4c84d1bce44ab4edabd01739cd49622f8c0c4f2b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Jan 2021 04:20:00 +0000 Subject: [PATCH 04/38] tiny: 0.7.0 -> 0.8.0 https://github.com/osa1/tiny/releases/tag/v0.8.0 --- pkgs/applications/networking/irc/tiny/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index c51d93378c5..676309a2bae 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -11,18 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "11kjndd4rzj83hzhcqvvp9nxjkana63m0h5r51xwp1ww9sn63km9"; + sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7"; }; - cargoSha256 = "079ns78acsff2qb59s7q0ck3j2fygcfqy8is6vfa71jyq7a0rjqm"; + cargoSha256 = "009jqizj4qg1bqslna35myxcark40hwlqsz58fbps9nsgp1i0hq2"; - RUSTC_BOOTSTRAP = 1; + cargoPatches = [ + # Fix Cargo.lock version. Remove with the next release. + (fetchpatch { + url = "https://github.com/osa1/tiny/commit/b1caf48a6399dad8875de1d965d1ad445e49585d.patch"; + sha256 = "1zkjhx94nwmd69cfwwwzg51ipcwq01wyvgsmn0vq7iaa2h0d286i"; + }) + ]; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; @@ -30,6 +36,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; + changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; }; From 568424435a75149db694977c17cc36208e8fb110 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Jan 2021 04:20:00 +0000 Subject: [PATCH 05/38] peco: 0.5.3 -> 0.5.8 --- pkgs/tools/text/peco/default.nix | 15 ++++----- pkgs/tools/text/peco/deps.nix | 57 -------------------------------- 2 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 pkgs/tools/text/peco/deps.nix diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 03d3580dded..2928d532207 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -1,28 +1,25 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "peco"; - version = "0.5.3"; + version = "0.5.8"; - goPackagePath = "github.com/peco/peco"; subPackages = [ "cmd/peco" ]; src = fetchFromGitHub { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "1m3s1jrrhqccgg3frfnq6iprwwi97j13wksckpcyrg51z6y5q041"; + sha256 = "12xbqisk7bcy38fmjxcs069a0600gncbqzscqw6x37lgw6hlw52x"; }; - goDeps = ./deps.nix; + vendorSha256 = "1p8pc50ql2vqnn0crx0y558i3m0d6vcdaj3995h3f0908pnk6x7q"; meta = with lib; { description = "Simplistic interactive filtering tool"; homepage = "https://github.com/peco/peco"; + changelog = "https://github.com/peco/peco/blob/v${version}/Changes"; license = licenses.mit; - # peco should work on Windows or other POSIX platforms, but the go package - # declares only linux and darwin. - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/text/peco/deps.nix b/pkgs/tools/text/peco/deps.nix deleted file mode 100644 index 29bae2de5b5..00000000000 --- a/pkgs/tools/text/peco/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "0c3044bc8bada22db67b93f5760fe3f05d6a5c25"; - sha256 = "05rdnf2c9r0yicg17zsq58i0sm32p0lk8zdnb7nhr0v5hqldvps4"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"; - sha256 = "1h3il3ycgd54flbyqys4hm4gzx1lyn5ja1k79f2y7zbs6y0mf1lz"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-pdebug"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-pdebug"; - rev = "2e6eaaa5717f81bda41d27070d3c966f40a1e75f"; - sha256 = "05dx1f1yln47nazyi50zix82xbnyva3hily4gh5gaz021h01npax"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; - sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; - sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; - sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; - }; - } -] From 470fc224b7d2558bbf2634fbd01fee73613b765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 10:48:32 +0100 Subject: [PATCH 06/38] radicale: 3.0.5 -> 3.0.6 --- pkgs/servers/radicale/3.x.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 4b49b1e40c8..bd781d869e9 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -1,15 +1,12 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { - pname = "radicale"; - version = "3.0.5"; + pname = "Radicale"; + version = "3.0.6"; - # No tests in PyPI tarball - src = fetchFromGitHub { - owner = "Kozea"; - repo = "Radicale"; - rev = version; - sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p"; + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6"; }; propagatedBuildInputs = with python3.pkgs; [ From 7c1eee3b8e0f21129705a43cf20b5d7960e6d9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 13:30:14 +0100 Subject: [PATCH 07/38] etesync-dav: 0.30.6 -> 0.30.7 --- pkgs/applications/misc/etesync-dav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 0cbb3cc75a7..f9deb188d3f 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.30.6"; + version = "0.30.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0cjz4p3a750fwvrxbzwda0sidw7nscahvppdshbsx49i6qrczpbg"; + sha256 = "16b3105834dd6d9e374e976cad0978e1acfed0f0328c5054bc214550aea3e2c5"; }; propagatedBuildInputs = with python3Packages; [ From 6cb37d21a3d8cbff0466756cb984be423225dc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 14:33:10 +0100 Subject: [PATCH 08/38] etesync-dav: mark as broken on Darwin --- pkgs/applications/misc/etesync-dav/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index f9deb188d3f..ba3568f862c 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, radicale3 }: +{ lib, stdenv, python3Packages, radicale3 }: python3Packages.buildPythonApplication rec { pname = "etesync-dav"; @@ -24,5 +24,6 @@ python3Packages.buildPythonApplication rec { description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; license = licenses.gpl3; maintainers = with maintainers; [ valodim ]; + broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing }; } From ce3eba01d2050d447b46a16adf5245ff2b7c1912 Mon Sep 17 00:00:00 2001 From: wpehrc <76795203+wpehrc@users.noreply.github.com> Date: Sat, 16 Jan 2021 13:23:40 -0500 Subject: [PATCH 09/38] adguardhome: 0.102.0 -> 0.104.3 --- pkgs/servers/adguardhome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 58996a6e85a..b62de105702 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "adguardhome"; - version = "0.102.0"; + version = "0.104.3"; src = fetchurl { url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; - sha256 = "192v3k0q8qdr52a34bf48i8rvm41wgi6an8a4rcsgyq5j8l7v76i"; + sha256 = "0p660d1nvaigyjc39xq5ar775davcbdgf0dh1z6gl3v4gx1h7bkn"; }; installPhase = '' From d951576c58ea8e3d016b7d3e1e07b2e83d66ce67 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 16 Jan 2021 19:28:13 +0100 Subject: [PATCH 10/38] phpExtensions.xdebug: 3.0.1 -> 3.0.2 --- pkgs/development/php-packages/xdebug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index b4052250aab..780bb8c9086 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.0.1"; - sha256 = "1da983crnk7ci3hfvqrb4gn9w364zzyi147wl4yly9d2adqk358b"; + version = "3.0.2"; + sha256 = "05sfgkw55ym7mg0b54l9x3i9598kf2bkp4z3sdl1hd31q3g4cv89"; doCheck = true; checkTarget = "test"; From 08bda74d2a5af7f8480fb9ecbfb40d0449f1aece Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 22:25:26 +0100 Subject: [PATCH 11/38] python3Packages.aiohomekit: init at 0.2.60 --- .../python-modules/aiohomekit/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/aiohomekit/default.nix diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix new file mode 100644 index 00000000000..5a51f66b16a --- /dev/null +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytestCheckHook +, pythonAtLeast +, zeroconf +}: + +buildPythonPackage rec { + pname = "aiohomekit"; + version = "0.2.60"; + format = "pyproject"; + disabled = pythonAtLeast "3.9"; + + src = fetchFromGitHub { + owner = "Jc2k"; + repo = pname; + rev = version; + sha256 = "03llk5i22hq163x568kz0qar5h0sda8f8cxbmgya6z2dcxv0a83p"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + cryptography + zeroconf + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + # Some test requires network access + disabledTests = [ + "test_remove_pairing" + "test_pair" + "test_add_and_remove_pairings" + ]; + + pythonImportsCheck = [ "aiohomekit" ]; + + meta = with lib; { + description = "Python module that implements the HomeKit protocol"; + longDescription = '' + This Python library implements the HomeKit protocol for controlling + Homekit accessories. + ''; + homepage = "https://github.com/Jc2k/aiohomekit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 754e0d75310..8edce51807d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -218,6 +218,8 @@ in { aioharmony = callPackage ../development/python-modules/aioharmony { }; + aiohomekit = callPackage ../development/python-modules/aiohomekit { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; From 9ee8c0fb9078a0ea8f07e60264dc4cb745e3d384 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 22:25:46 +0100 Subject: [PATCH 12/38] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3506998e194..a3044b2de71 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -351,7 +351,7 @@ "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit + "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks From 8bfc5b543fefaf99bbad5c44a2917d7cb8ee3ff8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 22:54:35 +0100 Subject: [PATCH 13/38] python3Packages.xknx: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 19720a55d23..b448f87a2d3 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.0"; + version = "0.16.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "0a9pxah37ml2a5qpc841ps22d256003i8d4mix2gh7nwxab2qp8j"; + sha256 = "0nma0fq67p9c90b6s5v7n4s6j94sdiwqf8rk1k2vfc6nxxn1jfll"; }; propagatedBuildInputs = [ From 8216d34b028cdbe5f1554c3f7002560710d427eb Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 15 Jan 2021 20:29:06 -0800 Subject: [PATCH 14/38] prometheus-rabbitmq-exporter: 0.25.2 -> 1.0.0-RC7.1 Otherwise, the root certificate from cloudAMQP is unsupported. --- .../prometheus/rabbitmq-exporter.nix | 9 +- .../prometheus/rabbitmq-exporter_deps.nix | 714 ++++++++++++++++-- 2 files changed, 675 insertions(+), 48 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 41069dabc6f..d9c08f8718d 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,17 +1,16 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { lib, stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "rabbitmq_exporter"; - version = "0.25.2"; + version = "1.0.0-RC7.1"; goPackagePath = "github.com/kbudde/rabbitmq_exporter"; src = fetchFromGitHub { owner = "kbudde"; repo = "rabbitmq_exporter"; - rev = "8238c5d9ad509dab94e631cdecf3d75155fbdee4"; - sha256 = "1zb21jms2wlmiw5vhk1wyhv0xrv5a9y08y9q6x92hv727kjqjr6w"; + rev = "v${version}"; + sha256 = "5Agg99yHBMgpWGD6Nk+WvAorRc7j2PGD+3z7nO3N/5s="; }; goDeps = ./rabbitmq-exporter_deps.nix; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix index 7a15a6a7b68..901edfaf6d9 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix @@ -1,12 +1,63 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) [ { - goPackagePath = "github.com/Sirupsen/logrus"; + goPackagePath = "bazil.org/fuse"; fetch = { type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "95cd2b9c79aa5e72ab0bc69b7ccc2be15bf850f6"; - sha256 = "1rkkhl68iw523bwxmp2prdrp8pk62xfp52wifzvbmqf8v1svwsqv"; + url = "https://github.com/bazil/fuse"; + rev = "371fbbdaa898"; + sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Azure/go-ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ansiterm"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.14"; + sha256 = "0n34wi9l9ks2z3cz97j30ljfmqppwf1zxr16hwbnswyrk54fcxm3"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Nvveen/Gotty"; + fetch = { + type = "git"; + url = "https://github.com/Nvveen/Gotty"; + rev = "cd527374f1e5"; + sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; + moduleDir = ""; }; } { @@ -14,26 +65,149 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + moduleDir = ""; }; } { - goPackagePath = "github.com/cenk/backoff"; + goPackagePath = "github.com/cenkalti/backoff"; fetch = { type = "git"; - url = "https://github.com/cenk/backoff"; - rev = "61153c768f31ee5f130071d08fc82b85208528de"; - sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.2.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + moduleDir = ""; }; } { - goPackagePath = "github.com/fsouza/go-dockerclient"; + goPackagePath = "github.com/cenkalti/backoff/v3"; fetch = { type = "git"; - url = "https://github.com/fsouza/go-dockerclient"; - rev = "1d4f4ae73768d3ca16a6fb964694f58dc5eba601"; - sha256 = "1s3m8jq8z1cm5rkn7dmjacf38n6ihkkzbdfang2aa2cgs5wl28y0"; + url = "https://github.com/cenkalti/backoff"; + rev = "v3.2.2"; + sha256 = "01h52k1sl6drabm3fgd4yy1iwbz06wcbbh16zd6v4wi7slabma9m"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cespare/xxhash/v2"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v2.1.1"; + sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/continuity"; + fetch = { + type = "git"; + url = "https://github.com/containerd/continuity"; + rev = "d3ef23f19fbb"; + sha256 = "0k5838j54ymqpg0dffr8k4vh992my9zlqrplx4syms09r9z9vap9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.4.0"; + sha256 = "0k8gja8ql4pqg5rzmqvka42vjfs6rzablak87whcnqba6qxpimvz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "bb3d318650d4"; + sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.9.0"; + sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + moduleDir = ""; }; } { @@ -41,8 +215,79 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + rev = "v1.4.0"; + sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.4.0"; + sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gotestyourself/gotestyourself"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotestyourself"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.9"; + sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + moduleDir = ""; }; } { @@ -50,8 +295,59 @@ fetch = { type = "git"; url = "https://github.com/kbudde/gobert"; - rev = "a6daecb9ddeb548b7cfb3f5ac9deef9ded522730"; - sha256 = "06g036w4dny8wdjwvprjjcdh0vx851qphgrvilrn5lghv3jdr29z"; + rev = "77f4c9cb2e7e"; + sha256 = "1d2m4b0pxswqhkjpbql3kbb9fjvyys4b9cpmhb9iwkcmnq3n8x91"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + moduleDir = ""; }; } { @@ -59,8 +355,19 @@ fetch = { type = "git"; url = "https://github.com/kylelemons/godebug"; - rev = "d65d576e9348f5982d7f6d83682b694e731a45c6"; - sha256 = "0bc8j9kwkp0hrsz0sm7hav7cm5jp9d6ql8r2b3mz78xb1g65xhbc"; + rev = "v1.1.0"; + sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.0.0"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + moduleDir = ""; }; } { @@ -68,8 +375,109 @@ fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; - sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.10.1"; + sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.7.0"; + sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "v1.0.0-rc9"; + sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ory/dockertest"; + fetch = { + type = "git"; + url = "https://github.com/ory/dockertest"; + rev = "v3.3.5"; + sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ory/dockertest/v3"; + fetch = { + type = "git"; + url = "https://github.com/ory/dockertest"; + rev = "v3.6.0"; + sha256 = "1l4czdb532rl1qjjh1ad00h1686dz9h9bg1kmmpyjfm4ggckndyw"; + moduleDir = ""; }; } { @@ -77,8 +485,19 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + moduleDir = ""; }; } { @@ -86,8 +505,9 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "v1.5.1"; + sha256 = "0nkhjpwpqr3iz2jsqrl37qkj1g4i8jvi5smgbvhxcpyinjj00067"; + moduleDir = ""; }; } { @@ -95,8 +515,9 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + rev = "v0.2.0"; + sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; + moduleDir = ""; }; } { @@ -104,8 +525,9 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca"; - sha256 = "14kn5w7imcxxlfdqxl21fsnlf1ms7200g3ldy29hwamldv8qlm7j"; + rev = "v0.9.1"; + sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; + moduleDir = ""; }; } { @@ -113,8 +535,39 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "a6e9df898b1336106c743392c48ee0b71f5c4efa"; - sha256 = "0zyprdp9bnpywcb6b9dzwyiji60mgf0s9wnw98zndfg3xrgnkasz"; + rev = "v0.0.11"; + sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.5.0"; + sha256 = "02s74gxzlzr982avw7vbfjkj696hyhklx1ikmmjiqp3z1l8hkghk"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "2da4a54c5cee"; + sha256 = "18qbrp774fx6dyibjcy9snld705gslq6z2sql1biyjahxkm1vpfy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + moduleDir = ""; }; } { @@ -122,8 +575,39 @@ fetch = { type = "git"; url = "https://github.com/streadway/amqp"; - rev = "ff791c2d22d3f1588b4e2cc71a9fba5e1da90654"; - sha256 = "1drridn4k1n7qy82msvw9r18w4pmrah1nip36wixz098nzalz55x"; + rev = "1c71cc93ed71"; + sha256 = "0k740vmzkdv9il201x4mj0md73w30jqlmn1q7m1ng3dmi635qrlr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/tkanos/gonfig"; + fetch = { + type = "git"; + url = "https://github.com/tkanos/gonfig"; + rev = "896f3d81fadf"; + sha256 = "1wcyq3vlfp12zsnnv1gpycqgzvq3nk8pvcabni6wxxyk3350d43m"; + moduleDir = ""; }; } { @@ -131,8 +615,9 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; - sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + moduleDir = ""; }; } { @@ -140,8 +625,19 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "a8b9294777976932365dabb6640cf1468d95c70f"; - sha256 = "112v83jfwd1brwaanjijvb7da4dx1iqk8b4bf9ahx0hvir56c2g8"; + rev = "d3edc9973b7e"; + sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + moduleDir = ""; }; } { @@ -149,8 +645,99 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840"; - sha256 = "1w66xqnpkskvj22a3f841qg4rgf0lzcrxp8678s6n07yw8qdh92p"; + rev = "1957bb5e6d1f"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a101b041ded4"; + sha256 = "1pm50dybm5wixjjspvfpafjmiy81b1zp08h13gxc5cylrfgncrfl"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "v1.21.0"; + sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/airbrake/gobrake.v2"; + rev = "v2.0.9"; + sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + rev = "v2.1.2"; + sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; + moduleDir = ""; }; } { @@ -158,8 +745,49 @@ fetch = { type = "git"; url = "https://gopkg.in/ory-am/dockertest.v3"; - rev = "a7951f7a8442f0e70d36e499ed4d744f00af2963"; - sha256 = "13qv0vl79m2wirhbjs0k2a3cjl6ib7sw6rg98v95xxpn8r39ijzw"; + rev = "v3.3.5"; + sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + moduleDir = ""; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + moduleDir = ""; + }; + } + { + goPackagePath = "gotest.tools/v3"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v3.0.2"; + sha256 = "0cap2aq2wphnbkkzkck5zdjxb64q3jqxfwpkgqys7279rbr8cvjm"; + moduleDir = ""; }; } ] From 0aa29da6d2bfe0ef5927b45c82e49802b5121397 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 23:33:11 +0100 Subject: [PATCH 15/38] python3Packages.utils: init at 1.0.1 --- .../python-modules/utils/default.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/utils/default.nix diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix new file mode 100644 index 00000000000..a6dd57e0e5e --- /dev/null +++ b/pkgs/development/python-modules/utils/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "utils"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "haaksmash"; + repo = "pyutils"; + rev = version; + sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr"; + }; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "utils" ]; + + meta = with lib; { + description = "Python set of utility functions and objects"; + homepage = "https://github.com/haaksmash/pyutils"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} From 8c58c96c9ea5ef884aad1f69492455bcba9fb8d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 23:55:48 +0100 Subject: [PATCH 16/38] python3Packages.python-hpilo: init at 4.4.3 --- .../python-modules/python-hpilo/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/python-hpilo/default.nix diff --git a/pkgs/development/python-modules/python-hpilo/default.nix b/pkgs/development/python-modules/python-hpilo/default.nix new file mode 100644 index 00000000000..f151e3ffb4c --- /dev/null +++ b/pkgs/development/python-modules/python-hpilo/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, utils +}: + +buildPythonPackage rec { + pname = "python-hpilo"; + version = "4.4.3"; + + src = fetchFromGitHub { + owner = "seveas"; + repo = pname; + rev = version; + sha256 = "1dk5xswydw7nmn9hlna1xca1mzcas9qv2kmid5yx8kvk3hjqci9v"; + }; + + # Most tests requires an actual iLO to run + doCheck = false; + pythonImportsCheck = [ "hpilo" ]; + + meta = with lib; { + description = "Python module to access the HP iLO XML interface"; + homepage = "https://seveas.github.io/python-hpilo/"; + license = with licenses; [ asl20 gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb786ff781e..69fafecca42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6151,6 +6151,8 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; + python-hpilo = callPackage ../development/python-modules/python-hpilo { }; + python-igraph = callPackage ../development/python-modules/python-igraph { pkgconfig = pkgs.pkgconfig; igraph = pkgs.igraph; @@ -7901,6 +7903,8 @@ in { userpath = callPackage ../development/python-modules/userpath { }; + utils = callPackage ../development/python-modules/utils { }; + uuid = callPackage ../development/python-modules/uuid { }; uvcclient = callPackage ../development/python-modules/uvcclient { }; From 0159cd91e8b8f5de68b9c223a21cd84969a818b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Jan 2021 23:57:38 +0100 Subject: [PATCH 17/38] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 861b53765ba..7b1afc86357 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -357,7 +357,7 @@ "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort "horizon" = ps: with ps; [ ]; # missing inputs: horimote - "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo + "hp_ilo" = ps: with ps; [ python-hpilo ]; "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense From 86dded674567cea05afc1b22f1ed152ec977ec66 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 17 Jan 2021 00:00:43 +0100 Subject: [PATCH 18/38] vapoursynth: R49 -> R52 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 87f35fbf60c..050de50d797 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R49"; + version = "R52"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl"; + sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; From 170de52c976d92173102f739feb74cdca3c898d9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 17 Jan 2021 01:07:10 +0100 Subject: [PATCH 19/38] electron: 9.4.0 -> 9.4.1 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 27e4eb88d46..6dcd08816d9 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -76,13 +76,13 @@ rec { headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.4.0" { - x86_64-linux = "2a81ef31fc4b1e1ea450f2c145179ad7c4b6fc752a7b9f3e27abd2461e908ea6"; - x86_64-darwin = "38fa3d93b74c425008d17712daa7676a0f4eb1a70b92da6d7a5c66bb078546cd"; - i686-linux = "629caa459e2fdf31e82501dfd194358d14112152c9d719be579850605ddd929a"; - armv7l-linux = "f46ae7a45d89007cec1c3f45e8e059f2d0e0b73dcadc009b96589ce8bb5e0e21"; - aarch64-linux = "7ebb9cebfa32add20f56b9b414a473f1cb55c90d55735b133f353a23ad76becd"; - headers = "17729m93a387v1sc0ayzfjpvbl1wr9vhlf8y11wyr4704iyimr72"; + electron_9 = mkElectron "9.4.1" { + x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28"; + x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd"; + i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe"; + armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60"; + aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc"; + headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; }; electron_10 = mkElectron "10.2.0" { From 29db28a834e4e402348904c3f24ded7d128908b2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 17 Jan 2021 01:07:39 +0100 Subject: [PATCH 20/38] electron: 10.2.0 -> 10.3.0 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 6dcd08816d9..966f307e0da 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -85,13 +85,13 @@ rec { headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; }; - electron_10 = mkElectron "10.2.0" { - x86_64-linux = "71e6f27433c7a098d0d0d4f2b624bc05cc81614d4e8cd0df71a78a6f9f4e4d5a"; - x86_64-darwin = "c6c32fa6b59d33f79e2f5cc317d7c61f0e1b8d7ab22c46a7a4e3fc3233785d7c"; - i686-linux = "d18208292cc5b64fed42b7ed21740b20f31c92b7612eb54ea1b71f8058a7439d"; - armv7l-linux = "b588b1d14b6f13b1e705180c52fae85113033efa630417a97555a085d7442ec4"; - aarch64-linux = "6cd8172939005cd12705d3c30be57e02e8b5271362ad60fb7378cc99a21db1e0"; - headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr"; + electron_10 = mkElectron "10.3.0" { + x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089"; + x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94"; + i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86"; + armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c"; + aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd"; + headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj"; }; electron_11 = mkElectron "11.2.0" { From 5b809848b4d4af866519f8d6e2ef256c03d3854f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albin=20Otterh=C3=A4ll?= Date: Sun, 17 Jan 2021 01:32:51 +0100 Subject: [PATCH 21/38] pijul: 1.0.0-alpha.31 -> 1.0.0-alpha.35 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a00332a93ce..2e33e4986d6 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.31"; + version = "1.0.0-alpha.35"; src = fetchCrate { inherit version pname; - sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4"; + sha256 = "02x4v63shlbnyppwm10qv8smbfz6a8kpwr3rcvzwpa0blqx2sq4n"; }; - cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; + cargoSha256 = "1hmj9470x1ynj5phxsyi0gakzmxbmgb5y51xarrks34f9z7a655v"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; From 1e72aa1feb133d6e12aa320b92e516ea1ac0abed Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 16 Jan 2021 19:15:03 -0800 Subject: [PATCH 22/38] beats: fix missing lib in extrafiles plugin --- pkgs/tools/audio/beets/plugins/extrafiles.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 584c7da7925..0ab6b3e5414 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages }: +{ lib, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-extrafiles"; From 00b75b7024d2852f5f7044dd4381322d2e8f262f Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Sat, 16 Jan 2021 22:26:40 -0500 Subject: [PATCH 23/38] firefox: limit disable-elf-hack to arm, x86{,_64} This is a follow up to #106617 which brought LTO support but broke the AArch64 Firefox builds. --- pkgs/applications/networking/browsers/firefox/common.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 123c3cc08a6..663a7dd4735 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -296,10 +296,9 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optionals ltoSupport [ - "--enable-lto" - "--disable-elf-hack" - ] ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" + ++ lib.optional ltoSupport "--enable-lto" + ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" + ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" From a018f7c35d3761a113be49acd835502b105a115a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 16 Jan 2021 21:34:23 -0800 Subject: [PATCH 24/38] age: 1.0.0-beta5 -> 1.0.0-beta6 https://github.com/FiloSottile/age/compare/v1.0.0-beta5...v1.0.0-beta6 --- pkgs/tools/security/age/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 4eb88211d6d..74a2bb7a620 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta5"; - vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; + version = "1.0.0-beta6"; + vendorSha256 = "sha256-FTByNpLkWWHAWe5wVDRBGtKap/5+XGHeBMQAIdlPCkA="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk"; + sha256 = "sha256-1LCcCEf2/R0am0jpA8yKl44+AoUFkbepxp9V6/nZkBQ="; }; meta = with lib; { From 0c4d9566f1899cbdfd5af8b23fa595360ad01068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Jan 2021 13:13:18 +0100 Subject: [PATCH 25/38] zoom-us: 5.4.53350.1027 -> 5.4.57862.0110 Replacing zooms qt library has led to incompatibilities between qt versions used in Nix and zoom. The new approach just sets LD_LIBRARY_PATH. LD_LIBRARY_PATH is also used internally by zoom for its own vendored library. The package has been tested end-to-end in a meeting. --- .../instant-messengers/zoom-us/default.nix | 188 +++++++++--------- 1 file changed, 89 insertions(+), 99 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 7fe1f5b0425..089f0b327af 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,128 +1,119 @@ -{ lib, stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash +{ stdenv +, lib +, fetchurl +, mkDerivation +, makeWrapper , fetchFromGitHub # Dynamic libraries -, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative -, qtgraphicaleffects, qtimageformats, qtlocation, qtquickcontrols -, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel -, qtwebengine +, alsaLib +, atk +, cairo +, dbus +, libGL +, fontconfig +, freetype +, gtk3 +, gdk-pixbuf +, glib +, pango +, wayland +, xorg +, libxkbcommon +, zlib # Runtime -, coreutils, faac, pciutils, procps, util-linux +, coreutils +, pciutils +, procps +, util-linux +, qttools , pulseaudioSupport ? true, libpulseaudio ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null }: assert pulseaudioSupport -> libpulseaudio != null; let - inherit (lib) concatStringsSep makeBinPath optional; - - version = "5.4.53350.1027"; + version = "5.4.57862.0110"; srcs = { x86_64-linux = fetchurl { - url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "11va3px42y81bwy10mxm7mk0kf2sni9gwb422pq9djck2dgchw5x"; + url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; + sha256 = "sha256-ZAwXhbZ3nT6PGkSC1vnX2y/XUOZfped0r3OuedI62gY="; }; }; + dontUnpack = true; - # Used for icons, appdata, and desktop file. - desktopIntegration = fetchFromGitHub { - owner = "flathub"; - repo = "us.zoom.Zoom"; - rev = "25e14f8141cdc682b4f7d9ebe15608619f5a19f2"; - sha256 = "0w3pdd5484r3nsb4iahi37jdlm37vm1053sb8k2zlqb9s554zjwp"; - }; + libs = lib.makeLibraryPath ([ + # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' + alsaLib + atk + cairo + dbus + libGL + fontconfig + freetype + gtk3 + gdk-pixbuf + glib + pango + stdenv.cc.cc + wayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXext + libxkbcommon + xorg.libXrender + zlib + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.libXfixes + xorg.libXtst + ] ++ lib.optional (pulseaudioSupport) libpulseaudio); -in mkDerivation { - pname = "zoom-us"; - inherit version; +in stdenv.mkDerivation { + name = "zoom-${version}"; - src = srcs.${stdenv.hostPlatform.system}; + dontUnpack = true; - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - dbus glib libGL libX11 libXfixes libuuid libxcb faac qtbase - qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2 - qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland + nativeBuildInputs = [ + makeWrapper ]; - runtimeDependencies = optional pulseaudioSupport libpulseaudio - ++ optional alsaSupport alsaLib; - - installPhase = - let - files = concatStringsSep " " [ - "*.pcm" - "*.png" - "ZoomLauncher" - "config-dump.sh" - "timezones" - "translations" - "version.txt" - "zcacert.pem" - "zoom" - "zoom.sh" - "zopen" - ]; - in '' - runHook preInstall - - mkdir -p $out/{bin,share/zoom-us} - - cp -ar ${files} $out/share/zoom-us - - # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd - cp libturbojpeg.so $out/share/zoom-us/libturbojpeg.so - - # Again, requires faac with a nonstandard filename. - ln -s $(readlink -e "${faac}/lib/libfaac.so") $out/share/zoom-us/libfaac1.so - - runHook postInstall - ''; - - postInstall = '' - mkdir -p $out/share/{applications,appdata,icons} - - # Desktop File - cp ${desktopIntegration}/us.zoom.Zoom.desktop $out/share/applications - substituteInPlace $out/share/applications/us.zoom.Zoom.desktop \ - --replace "Exec=zoom" "Exec=$out/bin/zoom-us" - - # Appdata - cp ${desktopIntegration}/us.zoom.Zoom.appdata.xml $out/share/appdata - - # Icons - for icon_size in 64 96 128 256; do - path=$icon_size'x'$icon_size - icon=${desktopIntegration}/us.zoom.Zoom.$icon_size.png - - mkdir -p $out/share/icons/hicolor/$path/apps - cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png - done + installPhase = '' + runHook preInstall + mkdir $out + tar -C $out -xf ${srcs.${stdenv.hostPlatform.system}} + mv $out/usr/* $out/ + runHook postInstall ''; - # $out/share/zoom-us isn't in auto-wrap directories list, need manual wrapping - dontWrapQtApps = true; - - qtWrapperArgs = [ - ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]}'' - # --run "cd ${placeholder "out"}/share/zoom-us" - # ^^ unfortunately, breaks run arg into multiple array elements, due to - # some bad array propagation. We'll do that in bash below - ]; - postFixup = '' - # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect - # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - qtWrapperArgs+=( --run "cd ${placeholder "out"}/share/zoom-us" ) + # Desktop File + substituteInPlace $out/share/applications/Zoom.desktop \ + --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - for app in ZoomLauncher zopen zoom; do - wrapQtApp $out/share/zoom-us/$app + for i in zopen zoom ZoomLauncher; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i done - ln -s $out/share/zoom-us/ZoomLauncher $out/bin/zoom-us + # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom + wrapProgram $out/opt/zoom/zoom \ + --prefix LD_LIBRARY_PATH ":" ${libs} + + rm $out/bin/zoom + # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect + # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: + makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ + --run "cd $out/opt/zoom" \ + --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]} \ + --prefix LD_LIBRARY_PATH ":" ${libs} + + # Backwards compatiblity: we used to call it zoom-us + ln -s $out/bin/{zoom,zoom-us} ''; + # already done + dontPatchELF = true; + passthru.updateScript = ./update.sh; meta = { @@ -132,5 +123,4 @@ in mkDerivation { platforms = builtins.attrNames srcs; maintainers = with lib.maintainers; [ danbst tadfisher doronbehar ]; }; - } From 47e997598cd0e51f4a0071bb4e90cb2bdcc38dde Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 09:04:36 +0700 Subject: [PATCH 26/38] pkgs/games: pkgconfig -> pkg-config --- pkgs/games/alephone/default.nix | 4 ++-- pkgs/games/asc/default.nix | 4 ++-- pkgs/games/chocolate-doom/default.nix | 4 ++-- pkgs/games/crack-attack/default.nix | 4 ++-- pkgs/games/eduke32/default.nix | 4 ++-- pkgs/games/gargoyle/default.nix | 4 ++-- pkgs/games/gweled/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 4 ++-- pkgs/games/naev/default.nix | 4 ++-- pkgs/games/nudoku/default.nix | 4 ++-- pkgs/games/openrct2/default.nix | 4 ++-- pkgs/games/t4kcommon/default.nix | 4 ++-- pkgs/games/taisei/default.nix | 4 ++-- pkgs/games/the-powder-toy/default.nix | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 44202da16ea..efd26d1c4f0 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg -, libpng, libsndfile, libvorbis, lua, pkgconfig, SDL2, SDL2_image, SDL2_net +, libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , alephone }: @@ -15,7 +15,7 @@ let sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh"; }; - nativeBuildInputs = [ pkgconfig icoutils ]; + nativeBuildInputs = [ pkg-config icoutils ]; buildInputs = [ boost diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 1b7feda4ebb..9e9f188bf1b 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs -, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2 +, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkg-config, zlib, zip, bzip2 , libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng + freetype libjpeg wxGTK lua perl pkg-config zlib zip bzip2 libpng libtiff fluidsynth libmikmod flac libvorbis libogg ]; diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 2336bd5e016..28ef9b6417e 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "chocolate-doom"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index b5fe9467d2e..f5296e8ce6b 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { "--datadir=${placeholder "out"}/share" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 8f90faa0381..a5796f697ef 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem , alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; - nativeBuildInputs = [ makeWrapper pkgconfig ] + nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index f6bbce2bf90..bd592dbc55d 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig +{ lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkg-config , SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }: let @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index faa6a225ed7..b15bb43a451 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, intltool -, gtk2, wrapGAppsHook, autoreconfHook, pkgconfig +, gtk2, wrapGAppsHook, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = false; - nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 4c3114a9202..1fe2223886a 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkg-config , zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ - autoreconfHook jam pkgconfig + autoreconfHook jam pkg-config ]; buildInputs = [ diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 4e5b7036763..f359b8c9d98 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis +{ lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkg-config, libvorbis , libpng, libGLU, libGL, makeWrapper, zlib, freetype }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h"; diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index b8ef2b3cbed..aaa6d324809 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext, ncurses }: stdenv.mkDerivation rec { pname = "nudoku"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace 0.19 0.20 ''; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext ]; buildInputs = [ ncurses ]; configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 96d79a8744e..912d0da59a0 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU -, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkgconfig +, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config , speexdsp, zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index bc820c8e8e4..74757c236c5 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkg-config, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; meta = with lib; { diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix index e0d1175fce8..4bc04a336f8 100644 --- a/pkgs/games/taisei/default.nix +++ b/pkgs/games/taisei/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl # Build depends -, docutils, meson, ninja, pkgconfig, python3 +, docutils, meson, ninja, pkg-config, python3 # Runtime depends , glfw, SDL2, SDL2_mixer , freetype, libpng, libwebp, libzip, zlib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - docutils meson ninja pkgconfig python3 + docutils meson ninja pkg-config python3 ]; buildInputs = [ diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 37d4553be6b..5d240a9fe91 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa"; }; - nativeBuildInputs = [ scons pkgconfig ]; + nativeBuildInputs = [ scons pkg-config ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; From 5d566c43b4877ad32fb096e4d606b57eaa6dfe37 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 09:09:27 +0700 Subject: [PATCH 27/38] pkgs/applications: pkgconfig -> pkg-config --- .../lightdm-enso-os-greeter/default.nix | 4 ++-- .../lightdm-mini-greeter/default.nix | 4 ++-- .../lightdm-tiny-greeter/default.nix | 4 ++-- .../display-managers/lightdm/default.nix | 4 ++-- .../display-managers/lightdm/gtk-greeter.nix | 4 ++-- .../applications/display-managers/sddm/default.nix | 4 ++-- pkgs/applications/misc/abook/default.nix | 4 ++-- pkgs/applications/misc/appeditor/default.nix | 4 ++-- pkgs/applications/misc/artha/default.nix | 4 ++-- pkgs/applications/misc/audio/sox/default.nix | 4 ++-- pkgs/applications/misc/ausweisapp2/default.nix | 4 ++-- pkgs/applications/misc/bemenu/default.nix | 4 ++-- pkgs/applications/misc/bibletime/default.nix | 4 ++-- pkgs/applications/misc/birdtray/default.nix | 4 ++-- pkgs/applications/misc/blogc/default.nix | 4 ++-- pkgs/applications/misc/calibre/default.nix | 4 ++-- pkgs/applications/misc/cardpeek/default.nix | 4 ++-- pkgs/applications/misc/cataract/build.nix | 4 ++-- pkgs/applications/misc/cbatticon/default.nix | 4 ++-- pkgs/applications/misc/chewing-editor/default.nix | 4 ++-- pkgs/applications/misc/cipher/default.nix | 4 ++-- pkgs/applications/misc/clight/clightd.nix | 4 ++-- pkgs/applications/misc/clight/default.nix | 4 ++-- pkgs/applications/misc/clipcat/default.nix | 4 ++-- pkgs/applications/misc/clipit/default.nix | 4 ++-- pkgs/applications/misc/cpu-x/default.nix | 4 ++-- pkgs/applications/misc/devilspie2/default.nix | 4 ++-- pkgs/applications/misc/diff-pdf/default.nix | 4 ++-- pkgs/applications/misc/digitalbitbox/default.nix | 4 ++-- pkgs/applications/misc/doomseeker/default.nix | 4 ++-- pkgs/applications/misc/dunst/default.nix | 4 ++-- pkgs/applications/misc/eaglemode/default.nix | 4 ++-- pkgs/applications/misc/elogind/default.nix | 4 ++-- pkgs/applications/misc/epdfview/default.nix | 4 ++-- pkgs/applications/misc/et/default.nix | 4 ++-- pkgs/applications/misc/evtest/default.nix | 4 ++-- pkgs/applications/misc/far2l/default.nix | 4 ++-- pkgs/applications/misc/fbreader/default.nix | 4 ++-- pkgs/applications/misc/fehlstart/default.nix | 4 ++-- pkgs/applications/misc/fme/default.nix | 4 ++-- pkgs/applications/misc/font-manager/default.nix | 4 ++-- pkgs/applications/misc/formatter/default.nix | 4 ++-- pkgs/applications/misc/fsv/default.nix | 6 +++--- pkgs/applications/misc/gImageReader/default.nix | 4 ++-- pkgs/applications/misc/galculator/default.nix | 4 ++-- pkgs/applications/misc/gammu/default.nix | 4 ++-- pkgs/applications/misc/garmin-plugin/default.nix | 4 ++-- pkgs/applications/misc/girara/default.nix | 4 ++-- pkgs/applications/misc/gkrellm/default.nix | 4 ++-- pkgs/applications/misc/gksu/default.nix | 4 ++-- pkgs/applications/misc/glom/default.nix | 4 ++-- pkgs/applications/misc/gmrun/default.nix | 4 ++-- pkgs/applications/misc/gmtp/default.nix | 4 ++-- .../misc/gnome-firmware-updater/default.nix | 4 ++-- .../misc/gnome-multi-writer/default.nix | 4 ++-- pkgs/applications/misc/gnome-recipes/default.nix | 4 ++-- pkgs/applications/misc/gnome-usage/default.nix | 4 ++-- pkgs/applications/misc/goldendict/default.nix | 4 ++-- pkgs/applications/misc/gosmore/default.nix | 4 ++-- pkgs/applications/misc/gpa/default.nix | 4 ++-- pkgs/applications/misc/gphoto2/default.nix | 4 ++-- pkgs/applications/misc/gphoto2/gphotofs.nix | 4 ++-- pkgs/applications/misc/gpscorrelate/default.nix | 4 ++-- pkgs/applications/misc/gpx-viewer/default.nix | 4 ++-- pkgs/applications/misc/green-pdfviewer/default.nix | 4 ++-- pkgs/applications/misc/grip/default.nix | 4 ++-- pkgs/applications/misc/gsimplecal/default.nix | 4 ++-- pkgs/applications/misc/gtk2fontsel/default.nix | 4 ++-- pkgs/applications/misc/gummi/default.nix | 4 ++-- pkgs/applications/misc/gv/default.nix | 4 ++-- pkgs/applications/misc/gxmessage/default.nix | 4 ++-- pkgs/applications/misc/gxneur/default.nix | 4 ++-- pkgs/applications/misc/hstr/default.nix | 4 ++-- pkgs/applications/misc/jgmenu/default.nix | 4 ++-- pkgs/applications/misc/k2pdfopt/default.nix | 4 ++-- pkgs/applications/misc/libosmocore/default.nix | 4 ++-- pkgs/applications/misc/librecad/default.nix | 4 ++-- pkgs/applications/misc/lighthouse/default.nix | 4 ++-- pkgs/applications/misc/ltwheelconf/default.nix | 4 ++-- pkgs/applications/misc/lyx/default.nix | 4 ++-- pkgs/applications/misc/mako/default.nix | 4 ++-- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/applications/misc/megacmd/default.nix | 4 ++-- pkgs/applications/misc/megasync/default.nix | 4 ++-- pkgs/applications/misc/merkaartor/default.nix | 4 ++-- pkgs/applications/misc/milu/default.nix | 4 ++-- pkgs/applications/misc/minder/default.nix | 4 ++-- .../misc/moonlight-embedded/default.nix | 4 ++-- pkgs/applications/misc/mupdf/1.17.nix | 4 ++-- pkgs/applications/misc/mupdf/default.nix | 4 ++-- pkgs/applications/misc/mysql-workbench/default.nix | 4 ++-- pkgs/applications/misc/navit/default.nix | 4 ++-- pkgs/applications/misc/nnn/default.nix | 4 ++-- pkgs/applications/misc/notejot/default.nix | 4 ++-- .../misc/notify-osd-customizable/default.nix | 4 ++-- pkgs/applications/misc/notify-osd/default.nix | 4 ++-- pkgs/applications/misc/nut/default.nix | 4 ++-- pkgs/applications/misc/nwg-launchers/default.nix | 4 ++-- pkgs/applications/misc/ola/default.nix | 4 ++-- pkgs/applications/misc/olifant/default.nix | 4 ++-- pkgs/applications/misc/onboard/default.nix | 4 ++-- pkgs/applications/misc/openbox-menu/default.nix | 4 ++-- pkgs/applications/misc/orca/default.nix | 4 ++-- pkgs/applications/misc/pbpst/default.nix | 4 ++-- pkgs/applications/misc/pcmanfm/default.nix | 4 ++-- pkgs/applications/misc/pcmanx-gtk2/default.nix | 4 ++-- pkgs/applications/misc/pdfmod/default.nix | 4 ++-- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- pkgs/applications/misc/plank/default.nix | 4 ++-- pkgs/applications/misc/polybar/default.nix | 4 ++-- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- pkgs/applications/misc/ptask/default.nix | 4 ++-- pkgs/applications/misc/pwsafe/default.nix | 4 ++-- pkgs/applications/misc/qcad/default.nix | 4 ++-- pkgs/applications/misc/qlcplus/default.nix | 4 ++-- pkgs/applications/misc/qolibri/default.nix | 4 ++-- pkgs/applications/misc/qpdfview/default.nix | 4 ++-- pkgs/applications/misc/quicksynergy/default.nix | 4 ++-- pkgs/applications/misc/razergenie/default.nix | 4 ++-- .../misc/redis-desktop-manager/default.nix | 4 ++-- pkgs/applications/misc/redshift/default.nix | 4 ++-- pkgs/applications/misc/regextester/default.nix | 4 ++-- pkgs/applications/misc/rofi-emoji/default.nix | 4 ++-- .../misc/rofi-file-browser/default.nix | 4 ++-- pkgs/applications/misc/rofi/default.nix | 4 ++-- pkgs/applications/misc/sc-im/default.nix | 4 ++-- pkgs/applications/misc/sdcv/default.nix | 4 ++-- pkgs/applications/misc/sequeler/default.nix | 4 ++-- pkgs/applications/misc/slade/default.nix | 4 ++-- pkgs/applications/misc/slade/git.nix | 4 ++-- pkgs/applications/misc/slstatus/default.nix | 4 ++-- pkgs/applications/misc/spacefm/default.nix | 4 ++-- pkgs/applications/misc/subsurface/default.nix | 4 ++-- pkgs/applications/misc/swappy/default.nix | 4 ++-- pkgs/applications/misc/synapse/default.nix | 4 ++-- pkgs/applications/misc/syncthing-tray/default.nix | 4 ++-- pkgs/applications/misc/taizen/default.nix | 4 ++-- pkgs/applications/misc/toggldesktop/default.nix | 6 +++--- pkgs/applications/misc/tomboy/default.nix | 4 ++-- pkgs/applications/misc/tootle/default.nix | 4 ++-- pkgs/applications/misc/twmn/default.nix | 4 ++-- pkgs/applications/misc/udevil/default.nix | 4 ++-- pkgs/applications/misc/veracrypt/default.nix | 4 ++-- pkgs/applications/misc/verbiste/default.nix | 4 ++-- pkgs/applications/misc/vifm/default.nix | 4 ++-- pkgs/applications/misc/viking/default.nix | 4 ++-- pkgs/applications/misc/volnoti/default.nix | 4 ++-- pkgs/applications/misc/vym/default.nix | 4 ++-- pkgs/applications/misc/waybar/default.nix | 4 ++-- .../misc/web-media-controller/default.nix | 4 ++-- pkgs/applications/misc/workrave/default.nix | 4 ++-- pkgs/applications/misc/xca/default.nix | 4 ++-- pkgs/applications/misc/xfe/default.nix | 4 ++-- pkgs/applications/misc/xfontsel/default.nix | 4 ++-- pkgs/applications/misc/xiphos/default.nix | 4 ++-- pkgs/applications/misc/xneur/default.nix | 4 ++-- pkgs/applications/misc/xpad/default.nix | 4 ++-- pkgs/applications/misc/xscope/default.nix | 4 ++-- pkgs/applications/misc/xsuspender/default.nix | 4 ++-- pkgs/applications/misc/xsw/default.nix | 4 ++-- pkgs/applications/misc/xxkb/default.nix | 6 +++--- pkgs/applications/misc/yate/default.nix | 4 ++-- pkgs/applications/misc/zathura/cb/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/djvu/default.nix | 4 ++-- .../misc/zathura/pdf-mupdf/default.nix | 4 ++-- .../misc/zathura/pdf-poppler/default.nix | 4 ++-- pkgs/applications/misc/zathura/ps/default.nix | 4 ++-- .../networking/browsers/firefox/common.nix | 4 ++-- .../networking/browsers/luakit/default.nix | 4 ++-- .../networking/browsers/lynx/default.nix | 4 ++-- .../networking/browsers/w3m/default.nix | 6 +++--- pkgs/applications/networking/calls/default.nix | 4 ++-- pkgs/applications/networking/cawbird/default.nix | 4 ++-- .../networking/cluster/docker-machine/kvm.nix | 4 ++-- .../networking/cluster/docker-machine/xhyve.nix | 4 ++-- .../networking/cluster/habitat/default.nix | 4 ++-- .../networking/cluster/hadoop/default.nix | 4 ++-- .../networking/cluster/k3s/default.nix | 6 +++--- .../networking/cluster/minishift/default.nix | 4 ++-- .../terraform-providers/libvirt/default.nix | 4 ++-- .../networking/feedreaders/castget/default.nix | 4 ++-- .../networking/feedreaders/feedreader/default.nix | 4 ++-- .../networking/ftp/filezilla/default.nix | 4 ++-- pkgs/applications/networking/ftp/taxi/default.nix | 4 ++-- pkgs/applications/networking/ids/snort/default.nix | 4 ++-- .../networking/ids/suricata/default.nix | 4 ++-- .../instant-messengers/baresip/default.nix | 4 ++-- .../instant-messengers/bitlbee-discord/default.nix | 4 ++-- .../bitlbee-facebook/default.nix | 4 ++-- .../bitlbee-mastodon/default.nix | 4 ++-- .../instant-messengers/bitlbee-steam/default.nix | 4 ++-- .../instant-messengers/bitlbee/default.nix | 4 ++-- .../instant-messengers/chatterino2/default.nix | 4 ++-- .../instant-messengers/coyim/default.nix | 4 ++-- .../networking/instant-messengers/dino/default.nix | 4 ++-- .../instant-messengers/freetalk/default.nix | 6 +++--- .../instant-messengers/linphone/default.nix | 4 ++-- .../instant-messengers/mcabber/default.nix | 4 ++-- .../instant-messengers/mirage/default.nix | 4 ++-- .../instant-messengers/nheko/default.nix | 4 ++-- .../pidgin-plugins/carbons/default.nix | 4 ++-- .../pidgin-plugins/pidgin-latex/default.nix | 4 ++-- .../pidgin-plugins/pidgin-mra/default.nix | 4 ++-- .../pidgin-opensteamworks/default.nix | 4 ++-- .../pidgin-plugins/pidgin-skypeweb/default.nix | 4 ++-- .../pidgin-plugins/purple-discord/default.nix | 4 ++-- .../pidgin-plugins/purple-matrix/default.nix | 4 ++-- .../pidgin-plugins/purple-slack/default.nix | 4 ++-- .../pidgin-plugins/skype4pidgin/default.nix | 4 ++-- .../pidgin-plugins/telegram-purple/default.nix | 4 ++-- .../instant-messengers/pidgin/default.nix | 4 ++-- .../instant-messengers/poezio/default.nix | 4 ++-- .../networking/instant-messengers/pond/default.nix | 4 ++-- .../instant-messengers/profanity/default.nix | 4 ++-- .../instant-messengers/ricochet/default.nix | 4 ++-- .../instant-messengers/ring-daemon/default.nix | 4 ++-- .../instant-messengers/silc-client/default.nix | 4 ++-- .../instant-messengers/swift-im/default.nix | 4 ++-- .../telegram/tdesktop/default.nix | 4 ++-- .../telepathy/gabble/default.nix | 4 ++-- .../instant-messengers/telepathy/haze/default.nix | 4 ++-- .../instant-messengers/telepathy/idle/default.nix | 4 ++-- .../telepathy/logger/default.nix | 4 ++-- .../instant-messengers/telepathy/salut/default.nix | 4 ++-- .../instant-messengers/toxic/default.nix | 4 ++-- .../networking/instant-messengers/utox/default.nix | 4 ++-- .../networking/irc/hexchat/default.nix | 4 ++-- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- .../networking/irc/irssi/fish/default.nix | 4 ++-- pkgs/applications/networking/irc/kvirc/default.nix | 4 ++-- pkgs/applications/networking/libcoap/default.nix | 4 ++-- .../networking/mailreaders/balsa/default.nix | 4 ++-- .../networking/mailreaders/claws-mail/default.nix | 4 ++-- .../networking/mailreaders/claws-mail/gtk3.nix | 4 ++-- .../networking/mailreaders/hasmail/default.nix | 4 ++-- .../networking/mailreaders/lumail/default.nix | 4 ++-- .../networking/mailreaders/meli/default.nix | 4 ++-- .../networking/mailreaders/notbit/default.nix | 4 ++-- .../mailreaders/notmuch-addrlookup/default.nix | 4 ++-- .../networking/mailreaders/notmuch/default.nix | 4 ++-- .../networking/mailreaders/notmuch/muchsync.nix | 4 ++-- .../networking/mailreaders/sylpheed/default.nix | 4 ++-- .../networking/mailreaders/thunderbird/68.nix | 4 ++-- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- .../networking/mailreaders/trojita/default.nix | 4 ++-- .../networking/modem-manager-gui/default.nix | 4 ++-- .../networking/nextcloud-client/default.nix | 4 ++-- .../applications/networking/nntp-proxy/default.nix | 4 ++-- pkgs/applications/networking/ping/default.nix | 4 ++-- pkgs/applications/networking/qv2ray/default.nix | 4 ++-- .../networking/seafile-client/default.nix | 4 ++-- pkgs/applications/office/abiword/default.nix | 4 ++-- pkgs/applications/office/aesop/default.nix | 4 ++-- pkgs/applications/office/bookworm/default.nix | 4 ++-- .../office/elementary-planner/default.nix | 4 ++-- pkgs/applications/office/envelope/default.nix | 4 ++-- pkgs/applications/office/espanso/default.nix | 4 ++-- pkgs/applications/office/gnucash/default.nix | 4 ++-- pkgs/applications/office/grisbi/default.nix | 4 ++-- pkgs/applications/office/homebank/default.nix | 4 ++-- pkgs/applications/office/ktimetracker/default.nix | 6 +++--- pkgs/applications/office/libreoffice/default.nix | 6 +++--- pkgs/applications/office/notes-up/default.nix | 4 ++-- pkgs/applications/office/osmo/default.nix | 4 ++-- pkgs/applications/office/pinpoint/default.nix | 4 ++-- pkgs/applications/office/planner/default.nix | 4 ++-- pkgs/applications/office/scribus/default.nix | 4 ++-- pkgs/applications/office/scribus/unstable.nix | 4 ++-- pkgs/applications/office/spice-up/default.nix | 4 ++-- pkgs/applications/office/timetable/default.nix | 4 ++-- pkgs/applications/office/tryton/default.nix | 4 ++-- pkgs/applications/office/wordgrinder/default.nix | 4 ++-- pkgs/applications/radio/airspy/default.nix | 4 ++-- pkgs/applications/radio/cubicsdr/default.nix | 4 ++-- pkgs/applications/radio/dablin/default.nix | 4 ++-- pkgs/applications/radio/dabtools/default.nix | 4 ++-- pkgs/applications/radio/dump1090/default.nix | 4 ++-- pkgs/applications/radio/fldigi/default.nix | 4 ++-- pkgs/applications/radio/fllog/default.nix | 4 ++-- pkgs/applications/radio/flmsg/default.nix | 4 ++-- pkgs/applications/radio/flrig/default.nix | 4 ++-- pkgs/applications/radio/flwrap/default.nix | 4 ++-- pkgs/applications/radio/gnuradio/3.7.nix | 4 ++-- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- pkgs/applications/radio/gnuradio/limesdr.nix | 4 ++-- pkgs/applications/radio/hackrf/default.nix | 4 ++-- pkgs/applications/radio/inspectrum/default.nix | 4 ++-- .../radio/kalibrate-hackrf/default.nix | 4 ++-- pkgs/applications/radio/kalibrate-rtl/default.nix | 4 ++-- pkgs/applications/radio/minimodem/default.nix | 4 ++-- pkgs/applications/radio/qsstv/default.nix | 4 ++-- pkgs/applications/radio/rtl-ais/default.nix | 4 ++-- pkgs/applications/radio/rtl-sdr/default.nix | 4 ++-- pkgs/applications/radio/rtl_433/default.nix | 4 ++-- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- pkgs/applications/radio/soapybladerf/default.nix | 4 ++-- pkgs/applications/radio/soapyhackrf/default.nix | 4 ++-- pkgs/applications/radio/soapyrtlsdr/default.nix | 4 ++-- pkgs/applications/radio/soapysdr/default.nix | 4 ++-- pkgs/applications/radio/svxlink/default.nix | 4 ++-- pkgs/applications/radio/tlf/default.nix | 4 ++-- pkgs/applications/radio/uhd/default.nix | 4 ++-- pkgs/applications/radio/unixcw/default.nix | 4 ++-- pkgs/applications/radio/welle-io/default.nix | 4 ++-- pkgs/applications/radio/wsjtx/default.nix | 2 +- pkgs/applications/radio/xlog/default.nix | 4 ++-- pkgs/applications/video/avidemux/default.nix | 4 ++-- pkgs/applications/video/avxsynth/default.nix | 4 ++-- pkgs/applications/video/bino3d/default.nix | 4 ++-- pkgs/applications/video/bombono/default.nix | 4 ++-- pkgs/applications/video/byzanz/default.nix | 4 ++-- pkgs/applications/video/ccextractor/default.nix | 4 ++-- pkgs/applications/video/celluloid/default.nix | 4 ++-- pkgs/applications/video/cinelerra/default.nix | 4 ++-- pkgs/applications/video/coriander/default.nix | 4 ++-- pkgs/applications/video/dvdauthor/default.nix | 4 ++-- pkgs/applications/video/dvdstyler/default.nix | 4 ++-- pkgs/applications/video/gnome-mplayer/default.nix | 4 ++-- pkgs/applications/video/gpac/default.nix | 4 ++-- pkgs/applications/video/handbrake/default.nix | 4 ++-- pkgs/applications/video/kino/default.nix | 4 ++-- pkgs/applications/video/kodi/default.nix | 14 +++++++------- .../applications/video/linuxstopmotion/default.nix | 4 ++-- pkgs/applications/video/mapmap/default.nix | 4 ++-- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- pkgs/applications/video/motion/default.nix | 4 ++-- pkgs/applications/video/mplayer/default.nix | 4 ++-- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/applications/video/mpv/scripts/mpris.nix | 4 ++-- pkgs/applications/video/mythtv/default.nix | 6 +++--- pkgs/applications/video/natron/default.nix | 8 ++++---- pkgs/applications/video/obs-studio/default.nix | 4 ++-- pkgs/applications/video/obs-studio/wlrobs.nix | 4 ++-- pkgs/applications/video/olive-editor/default.nix | 4 ++-- .../video/openshot-qt/libopenshot-audio.nix | 4 ++-- .../applications/video/openshot-qt/libopenshot.nix | 4 ++-- pkgs/applications/video/p2pvc/default.nix | 4 ++-- pkgs/applications/video/peek/default.nix | 4 ++-- .../video/plex-media-player/default.nix | 4 ++-- pkgs/applications/video/qmediathekview/default.nix | 4 ++-- pkgs/applications/video/qstopmotion/default.nix | 4 ++-- pkgs/applications/video/quvi/library.nix | 4 ++-- pkgs/applications/video/quvi/scripts.nix | 4 ++-- pkgs/applications/video/quvi/tool.nix | 4 ++-- pkgs/applications/video/shotcut/default.nix | 4 ++-- .../video/simplescreenrecorder/default.nix | 4 ++-- pkgs/applications/video/subtitleeditor/default.nix | 4 ++-- pkgs/applications/video/vdr/default.nix | 4 ++-- pkgs/applications/video/vlc/default.nix | 4 ++-- pkgs/applications/video/vokoscreen/default.nix | 4 ++-- pkgs/applications/video/webcamoid/default.nix | 4 ++-- pkgs/applications/video/wxcam/default.nix | 4 ++-- pkgs/applications/video/xine-ui/default.nix | 4 ++-- pkgs/applications/video/xvidcap/default.nix | 4 ++-- pkgs/applications/virtualization/bochs/default.nix | 4 ++-- .../virtualization/cloud-hypervisor/default.nix | 4 ++-- .../applications/virtualization/crosvm/default.nix | 4 ++-- pkgs/applications/virtualization/crun/default.nix | 4 ++-- .../virtualization/libnvidia-container/default.nix | 4 ++-- .../looking-glass-client/default.nix | 4 ++-- .../virtualization/open-vm-tools/default.nix | 4 ++-- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- pkgs/applications/virtualization/qtemu/default.nix | 4 ++-- .../virtualization/spice-vdagent/default.nix | 4 ++-- .../virtualization/virt-manager/qt.nix | 4 ++-- .../virtualization/virt-viewer/default.nix | 4 ++-- .../virtualization/virtualbox/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 371 files changed, 755 insertions(+), 755 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 43f5bcd495a..f595e211dc2 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 363e0503c2d..d1cd2e7d3e4 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 29dece3e5cf..5c2a6d7c59b 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 ad74cbfb703..6a96f560ddc 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 6acb05478d8..90f7a03d0dd 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 fd02536589f..f43d3ca9be3 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 ' -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 diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index a6c18e7d3d4..62cba4a5b73 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "abook-0.6.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ ncurses readline ]; meta = { diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 20ee9a25494..d0db2b12dfd 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -4,7 +4,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , gettext @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index bc31b844f18..37a1cee79a6 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: +{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkg-config, wordnet }: stdenv.mkDerivation { pname = "artha"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus-glib gtk2 wordnet ]; patches = [ diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index d77c5486f15..dd5dbde5286 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, CoreAudio +{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = optional enableOpusfile pkgconfig; + nativeBuildInputs = optional enableOpusfile pkg-config; buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index e4305118b57..82e7c1bb21b 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index ca38498edb8..8de0ceeae65 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkgconfig +, pango, fribidi, harfbuzz, pcre, pkg-config , ncursesSupport ? true, ncurses ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null , x11Support ? true, xlibs ? null, xorg ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; }; - nativeBuildInputs = [ pkgconfig pcre ]; + nativeBuildInputs = [ pkg-config pcre ]; makeFlags = ["PREFIX=$(out)"]; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index c004a65ef83..3213ed9edf0 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +{ lib, mkDerivation, stdenv, fetchurl, cmake, pkg-config, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sword boost clucene_core qtbase qttools qtsvg qtwebkit diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index df12d2b9f8f..ce8db160a75 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake - , pkgconfig + , pkg-config , qtbase , qttools , qtx11extras @@ -26,7 +26,7 @@ mkDerivation rec { ./fix-qttranslations-path.diff ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/applications/misc/blogc/default.nix index 57be731a121..c74718c52fb 100644 --- a/pkgs/applications/misc/blogc/default.nix +++ b/pkgs/applications/misc/blogc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ronn, git, cmocka }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ronn, git, cmocka }: stdenv.mkDerivation rec { pname = "blogc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hx0gpvmv7rd910czafvmcpxabbvfmvdyxk4d1mckmblx8prb807"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ronn git cmocka ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8ea1dba54ed..d838cd4e859 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchurl , poppler_utils -, pkgconfig +, pkg-config , libpng , imagemagick , libjpeg @@ -55,7 +55,7 @@ mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ]; + nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index c565a1bf994..1d5baf9f6b3 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, gtk3, pcsclite, lua5_2, curl, readline }: let version = "0.8.4"; @@ -14,7 +14,7 @@ in sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 3347321d71d..f894dc91bd8 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -2,7 +2,7 @@ , fetchgit , autoreconfHook , glib -, pkgconfig +, pkg-config , libxml2 , exiv2 , imagemagick @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit sha256 rev; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib libxml2 exiv2 imagemagick ]; prePatch = '' diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index e77958b724d..482bec9d054 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ glib gtk3 libnotify ]; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index e1a57bb5300..fb5d9aed959 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase , qttools }: mkDerivation rec { @@ -14,7 +14,7 @@ mkDerivation rec { doCheck = true; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libchewing qtbase qttools ]; meta = with lib; { diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index ccf7da70f6e..eab1185edd8 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , gettext @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index e1f019ffa45..51c61ca28e7 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkgconfig +, dbus, cmake, pkg-config , glib, udev, polkit, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus cmake - pkgconfig + pkg-config ]; buildInputs = with lib; [ diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 2502459af10..6ef2e886a19 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkgconfig, bash-completion +, dbus, cmake, pkg-config, bash-completion , gsl, popt, clightd, systemd, libconfig, libmodule , withGeoclue ? true, geoclue2 , withUpower ? true, upower }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus cmake - pkgconfig + pkg-config bash-completion ]; diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 244770e138f..80e4982fc8a 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg -, pkgconfig, llvmPackages, clang, protobuf, python3 }: +, pkg-config, llvmPackages, clang, protobuf, python3 }: rustPlatform.buildRustPackage rec { pname = "clipcat"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ - pkgconfig + pkg-config clang llvmPackages.libclang diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 692622df8ea..630ee3c3683 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, fetchpatch, lib, stdenv -, autoreconfHook, intltool, pkgconfig +, autoreconfHook, intltool, pkg-config , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { intltoolize --copy --force --automake ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook autoreconfHook intltool ]; configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; buildInputs = [ gtk3 libayatana-appindicator ]; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index a14aad7a0fc..d0ef6f05aeb 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses , libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; buildInputs = [ gtk3 ncurses libcpuid pciutils procps ]; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 70fb38d17c4..2d3c28b2d71 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck3 }: stdenv.mkDerivation rec { pname = "devilspie2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib gtk lua libwnck3 ]; installPhase = '' diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 471755c6392..f5e5dccd0f3 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: let wxInputs = @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1y5ji4c4m69vzs0z051fkhfdrjnyxb6kzac5flhdkfb2hgp1jnxl"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo poppler ] ++ wxInputs; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 0c731aca713..ea78924574f 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -10,7 +10,7 @@ , udev , libusb1 , makeWrapper -, pkgconfig +, pkg-config , qtbase , qttools , qtwebsockets @@ -63,7 +63,7 @@ in mkDerivation rec { curl git makeWrapper - pkgconfig + pkg-config qttools ]; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index f193ae4c518..48ea1a0296c 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkg-config, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: mkDerivation { pname = "doomseeker"; @@ -13,7 +13,7 @@ mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; + nativeBuildInputs = [ cmake qttools pkg-config xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; hardeningDisable = lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index a906669e7c6..eed07a2356e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, which, perl, libXrandr +, pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c"; }; - nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; + nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 806d960222d..d411ce7ae81 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig, +{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ]; diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 8a96cddaff2..a3919648f74 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -8,7 +8,7 @@ , getent , libcap , gettext -, pkgconfig +, pkg-config , udev , eudev , libxslt @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meson ninja m4 - pkgconfig + pkg-config gperf getent libcap diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 90884af9fdf..9eea30e74f8 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, poppler }: stdenv.mkDerivation rec { pname = "epdfview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 poppler ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 0de4ad9e21f..de47efc07ef 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "et"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libnotify gdk-pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 3406fc572c7..84fae703a0c 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { pname = "evtest"; version = "1.34"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 ]; src = fetchgit { diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index e56f60624c8..c3e9218b588 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; - nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; + nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 35a50dd10a3..c2347d5fbb8 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" @@ -50,7 +50,7 @@ stdenv.mkDerivation { --replace -llinebreak -lunibreak ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 curl expat fribidi libunibreak sqlite zlib diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 55d47459aed..992b6278082 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }: +{ lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }: stdenv.mkDerivation { name = "fehlstart-9f4342d7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; patches = [ ./use-nix-profiles.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 keybinder ]; preConfigure = '' diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 1a4b38a1cad..52ba2927fd4 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext , fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 8b8fc09f7d3..3efef455313 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, - pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, + pkg-config, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 71479c4ac3e..26c6a8cbc70 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , substituteAll @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 5ab21ad98b9..a965c615dfd 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook -, libtool, pkgconfig, gtk2, libGLU, file +, libtool, pkg-config, gtk2, libGLU, file }: let @@ -10,7 +10,7 @@ let url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libGLU ]; hardeningDisable = [ "format" ]; }; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ file gtk2 libGLU gtkglarea ]; meta = with lib; { diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 80ec6f82571..2e1afa8053b 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuuid , sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract , intltool, poppler, json-glib , ninja @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja intltool - pkgconfig + pkg-config pythonEnv # Gtk specific diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 6d7989412d4..287a2fca363 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, intltool -, gtk, pkgconfig, flex }: +, gtk, pkg-config, flex }: stdenv.mkDerivation rec { pname = "galculator"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ gtk flex ]; meta = with lib; { diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 841c629dadf..0a6796a9b07 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl +{ lib, stdenv, fetchFromGitHub, python, pkg-config, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./bashcomp-dir.patch ./systemd.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ] ++ optionals dbiSupport [ libdbi libdbiDrivers ] diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 7fdb62e5bed..c2c3a69140b 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: +{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4c61a4dad51..f8ebd8aed7e 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; + nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 4d2fc15934b..2cc20b424b1 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which +{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which , IOKit ? null }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 973b0ce288d..9d8ce3cc480 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk-doc wrapGAppsHook + pkg-config intltool gtk-doc wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index bda4b1d75f0..47d56288ed2 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , autoconf , automake , libtool @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoconf automake libtool diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index b3ef510739b..bd99adf9435 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: +{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, popt }: let version = "0.9.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt ]; doCheck = true; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 0c9f20b2092..1479fe7bc7d 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 +{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix index 88be6b22f28..30d3b57003d 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -11,7 +11,7 @@ , libxmlb , meson , ninja -, pkgconfig +, pkg-config , systemd , help2man , wrapGAppsHook @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { help2man meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 29078ca773d..89a967d718b 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -11,7 +11,7 @@ , libgudev , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , polkit , udisks @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index d67bcdb867d..168d5b9fb5c 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , desktop-file-utils , gettext @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils gettext itstool diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index e40c6866729..fee4ba655c3 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , vala , gettext , libxml2 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 63b36e2dec4..307ef57c625 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , withCC ? true, opencc @@ -30,7 +30,7 @@ mkDerivation rec { --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" ''; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 4d55129193f..854fec8642a 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : +{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } : let version = "31801"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ libxml2 gtk2 curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 6bda23aebe0..63bba909b6d 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ gtk2 gpgme libgpgerror libassuan ]; meta = with lib; { diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 409aaded4b6..5635aadda9d 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , gettext , libexif , libgphoto2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext libtool ]; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index c5511847ba0..afb02c9937f 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: +{ lib, stdenv, fetchurl, libtool, pkg-config, libgphoto2, fuse, glib }: stdenv.mkDerivation rec { pname = "gphoto2fs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgphoto2 fuse glib libtool ]; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 5d8296d337f..a1357ff0a08 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 docbook_xsl libxslt - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 2c14691869f..89a4198a749 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-database-updates" ]; nativeBuildInputs = [ - intltool pkgconfig + intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 876ab562598..fe21631c0d6 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: +{ lib, stdenv, fetchFromGitHub, poppler, pkg-config, gdk-pixbuf, SDL, gtk2 }: stdenv.mkDerivation { pname = "green-pdfviewer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ poppler gdk-pixbuf SDL gtk2 ]; patches = [ diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index ef7783f5011..5ebe7765e50 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte +{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index f692ea54ccf..21128ac9119 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, automake, autoconf, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "gsimplecal"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf gtk3 ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 828cd952bbc..d635fa8d865 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2 }: +{lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { version = "0.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ stdenv gtk2 ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 2ad89a4c160..f0416e232dc 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgs , glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive -, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +, pkg-config, intltool, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool autoreconfHook wrapGAppsHook + pkg-config intltool autoreconfHook wrapGAppsHook ]; buildInputs = [ glib gtksourceview3 gtk3 gtkspell3 poppler diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index d599a295bf1..aa07058dc80 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: +{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: let name = "gv-3.7.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { Xaw3d ghostscriptX perl - pkgconfig + pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 13f7395f6f8..9f09e3d978e 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk3, intltool, pkg-config, texinfo }: stdenv.mkDerivation rec { pname = "gxmessage"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk3 texinfo ]; meta = { diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 2e2e9f0850e..9e8c5ddaef4 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { name = "gxneur-0.20.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur libglade GConf pcre libappindicator-gtk2 diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index e7155c4da35..3cda6d0a318 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, readline, ncurses -, autoreconfHook, pkgconfig, gettext }: +, autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { pname = "hstr"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; configureFlags = [ "--prefix=$(out)" ]; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index baa0232a23e..d0b9eff35f4 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , python3Packages , pango , librsvg @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper python3Packages.wrapPython ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index e118197f42a..6b594f196c9 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub -, cmake, pkgconfig, zlib, libpng, makeWrapper +, cmake, pkg-config, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf_1_17 @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { --replace "" "" ''; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = let diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 27432a4dd75..273ca0245a2 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , pcsclite, talloc, python2, gnutls }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 676b7aea1e2..08bf01aea61 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -5,7 +5,7 @@ , installShellFiles , mkDerivationWith , muparser -, pkgconfig +, pkg-config , qmake , qtbase , qtsvg @@ -83,7 +83,7 @@ mkDerivationWith stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index a54b8a54e8b..e9aa79dcdd8 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , libX11, libxcb, cairo, gtk2, pango, python27, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb cairo gtk2 pango python27 python3 ]; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 66d10f5e6b8..52fac494156 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libusb1, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, libusb1, pkg-config, fetchFromGitHub }: stdenv.mkDerivation { pname = "ltwheelconf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; installPhase = '' diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 3c915875096..800de77f1c5 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc +{ fetchurl, lib, mkDerivation, pkg-config, python, file, bc , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -12,7 +12,7 @@ mkDerivation rec { }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qtbase qtsvg python file/*for libmagic*/ bc hunspell makeWrapper # enchant diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 3c1babaab37..a845a767b2a 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc , systemd, pango, cairo, gdk-pixbuf , wayland, wayland-protocols , wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ "-Dzsh-completions=true" ]; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 99aada11f04..3e8aacb9895 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index bb90d76977b..7c81e9607f9 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo zlib ]; sourceRoot = "./MediaInfo/Project/GNU/CLI/"; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 1e7aa1f56db..23d34f30d64 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -15,7 +15,7 @@ , libuv , libzen , pcre-cpp -, pkgconfig +, pkg-config , readline , sqlite }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index b7f8c0a281d..c302a4b4a07 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -16,7 +16,7 @@ , libzen , lsb-release , mkDerivation -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -39,7 +39,7 @@ mkDerivation rec { }; nativeBuildInputs = - [ autoconf automake doxygen lsb-release pkgconfig qttools swig ]; + [ autoconf automake doxygen lsb-release pkg-config qttools swig ]; buildInputs = [ c-ares cryptopp diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e73805f67b3..8eee8c1f09f 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch , boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 95077bdcb33..23da8abc668 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, glib, llvmPackages }: stdenv.mkDerivation { pname = "milu-nightly"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp bin/milu $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib unzip diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 1c25e5c3320..16fa17609e1 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, meson, ninja, python3 +, pkg-config, meson, ninja, python3 , wrapGAppsHook, vala, shared-mime-info , cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive , discount, gtksourceview3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; }; - nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; + nativeBuildInputs = [ pkg-config meson ninja python3 wrapGAppsHook vala shared-mime-info ]; buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme discount gtksourceview3 ]; postPatch = '' diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 06835aad4d1..9fa4089c4cd 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 -, ffmpeg_3, pkgconfig, xorg, libvdpau, libpulseaudio, libcec +, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ alsaLib libevdev libopus udev SDL2 - ffmpeg_3 pkgconfig xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index 722798a43a9..95e9c7c3307 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 190696584db..61c395e64a9 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , gumbo , enableX11 ? true, libX11, libXext, libXi, libXrandr @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "shared" ]; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 34e124367eb..63dde76fabc 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,7 +3,7 @@ , substituteAll , cmake , ninja -, pkgconfig +, pkg-config , glibc , gtk3 , gtkmm3 @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config jre swig wrapGAppsHook diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index f1fb59811be..c041c296927 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2 , SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib , librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { qtbase qtlocation qtdeclarative qtsvg ]; - nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ]; # we dont want blank screen by defaut postInstall = '' diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 1bf16d037f9..4c36b3d930f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, conf ? null }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline ncurses ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 5a84f91bb74..0b781f61369 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon +{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkg-config, meson, ninja, python3, pantheon , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index aeeb1051b09..e62b3a33487 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -7,7 +7,7 @@ , libtool , libwnck3 , makeWrapper -, pkgconfig +, pkg-config , gsettings-desktop-schemas }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { preConfigure = "./autogen.sh --libexecdir=$(out)/bin"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper gsettings-desktop-schemas gnome3.gnome-common diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index bc2e4076404..d68601ca6ec 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: +{ lib, stdenv, fetchurl, pkg-config, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "notify-osd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper gsettings-desktop-schemas diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index d36efb483db..4694c243b39 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi +{ lib, stdenv, fetchurl, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; configureFlags = [ "--with-all" diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index e6575b780f7..99033f14a6d 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -5,7 +5,7 @@ , meson , ninja , nlohmann_json -, pkgconfig +, pkg-config , swaylock , makeWrapper }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config cmake makeWrapper ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 6524052e5f3..224b5921baa 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -3,7 +3,7 @@ , autoreconfHook , bison , flex -, pkgconfig +, pkg-config , libuuid , cppunit , protobuf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "17a3z3zhx00rjk58icd3zlqfw3753f3y8bwy2sza0frdim09lqr4"; }; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ]; buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; propagatedBuildInputs = [ python3.pkgs.protobuf diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index b6d184efe46..fbaf140a9f7 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -5,7 +5,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , python3 , libgee , gsettings-desktop-schemas @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 65f15c1e7ed..42433936aba 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -20,7 +20,7 @@ , mousetweaks , udev , libxkbcommon -, pkgconfig +, pkg-config , procps , python3 , wrapGAppsHook @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection intltool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 5467d4faa3b..9d2695f97ff 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index e0c728fc675..25cca1536f8 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, pkgconfig +, pkg-config , fetchurl , buildPythonApplication , autoreconfHook @@ -57,7 +57,7 @@ buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook - pkgconfig + pkg-config libxmlxx3 gettext yelp-tools diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index ebca7a42409..68b1908e515 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkgconfig, curl, git, gettext, jansson +, python36Packages, which, pkg-config, curl, git, gettext, jansson # Optional overrides , maxFileSize ? 64 # in MB @@ -20,7 +20,7 @@ llvmPackages.stdenv.mkDerivation rec { nativeBuildInputs = [ python36Packages.sphinx which - pkgconfig + pkg-config curl git gettext diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index e9158d252c6..da1c79865a7 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config , wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index cb8b6150777..484b9d3b407 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "pcmanx-gtk2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libXft intltool automake autoconf libtool ]; preConfigure = '' diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 456acb9bbd1..da9340f3075 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 1e7f0352c47..6430b894b7b 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook , webkitgtk, discount, json-glib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig vala + cmake pkg-config vala # For setup hook gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index cdc08686124..b462e5f134b 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -13,7 +13,7 @@ , libXi , pango , gettext -, pkgconfig +, pkg-config , libxml2 , bamf , gdk-pixbuf @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext gnome3.gnome-common libxml2 # xmllint - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 2556eb02062..c79da21ad63 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,4 +1,4 @@ -{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig +{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkg-config , python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper , removeReferencesTo @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { '' else ""; nativeBuildInputs = [ - cmake pkgconfig removeReferencesTo + cmake pkg-config removeReferencesTo ]; postFixup = '' diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 80936d910a3..7cd31adfa32 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 , gtest, nlopt, xorg, makeDesktopItem , cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 011b782053e..b243f194181 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }: +{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: stdenv.mkDerivation rec { name = "ptask-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 json_c ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; patches = [ ./tw-version.patch ./json_c_is_error.patch ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index c1b9d04d673..2e7c77c0935 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zip, gettext, perl , wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext perl pkgconfig zip + cmake gettext perl pkg-config zip ]; buildInputs = [ libXext libXi libXt libXtst wxGTK30 diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index ac1db54ebce..c6b9d82bcf4 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -3,7 +3,7 @@ , libGLU , mkDerivationWith , muparser -, pkgconfig +, pkg-config , qtbase , qmake , qtscript @@ -85,7 +85,7 @@ mkDerivationWith stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 0f359007696..c6306294ecd 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 6cdd97e666f..3b61e3dbc1a 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo , qtbase, qtmultimedia, qttools, qtwebengine }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libeb lzo qtbase qtmultimedia qttools qtwebengine ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 8e8ffb2921c..0892632c1d8 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups +{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,7 +10,7 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index ee95d6baeba..81a4ef3d99f 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2, synergy}: +{lib, stdenv, fetchurl, pkg-config, gtk2, synergy}: stdenv.mkDerivation rec { pname = "quicksynergy"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 synergy diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index 35ffb804c49..8f78c0becaf 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, meson, ninja, pkgconfig, qtbase, qttools +{ stdenv, fetchFromGitHub, lib, meson, ninja, pkg-config, qtbase, qttools , wrapQtAppsHook , enableExperimental ? false , includeMatrixDiscovery ? false @@ -19,7 +19,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig meson ninja wrapQtAppsHook + pkg-config meson ninja wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ec40347cbcb..844fd19e22c 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkgconfig, libssh2 +{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1, qtcharts , qmake @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtquick1 qtquickcontrols qtsvg qttools qtcharts diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 81a8267e51d..5798473db5e 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -30,7 +30,7 @@ let gettext intltool libtool - pkgconfig + pkg-config wrapGAppsHook wrapPython ]; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index a6762d7d846..eac131d6ef7 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -3,7 +3,7 @@ , vala , gettext , libxml2 -, pkgconfig +, pkg-config , glib , gtk3 , gnome3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 14742da35da..73d8999be5b 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -6,7 +6,7 @@ , makeWrapper , autoreconfHook -, pkgconfig +, pkg-config , cairo , glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index d5b0944ac39..0f9067a7e39 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, rofi, gtk3 }: stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace "/usr/share/" "$out/share/" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rofi gtk3 ]; ROFI_PLUGINS_DIR = "$out/lib/rofi"; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 6ee2cb8c349..33a37e32612 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git +, autoreconfHook, pkg-config, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 21cf60b60fc..0ae7a5c1ec0 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkg-config }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ yacc ncurses libxml2 libzip libxls ]; buildPhase = '' diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index ea3fc7d30f1..391ef82daf1 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, gettext, readline }: stdenv.mkDerivation rec { pname = "sdcv"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib gettext readline ]; preInstall = '' diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index ff7fc7dd082..c8a0e0175fa 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nix-update-script -, vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils +, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index ed0dde0ffaf..e9ba7b2a8f3 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation rec { pname = "slade"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; }; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; meta = with lib; { diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index b7fee00a40f..dfbfbe55669 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation { name = "slade-git-3.1.2.2018.01.29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; cmakeFlags = ["-DNO_WEBVIEW=1"]; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; meta = with lib; { diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index e4f86427386..613d2f8e78b 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null, patches ? [] }: +{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { inherit patches; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 85ce1e6b1bb..e08240733d1 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,5 +1,5 @@ { pkgs, fetchFromGitHub, lib, stdenv, gtk3, udev, desktop-file-utils -, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, shared-mime-info, intltool, pkg-config, wrapGAppsHook, ffmpegthumbnailer , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info intltool wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index ab3423c4737..51d015c6e41 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -84,7 +84,7 @@ in stdenv.mkDerivation { qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; cmakeFlags = [ "-DLIBDC_FROM_PKGCONFIG=ON" diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index 11798db34f5..bf1fdf63fed 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -5,7 +5,7 @@ , cairo , pango , gtk -, pkgconfig +, pkg-config , cmake , scdoc , libnotify @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; }; - nativeBuildInputs = [ glib meson ninja pkgconfig cmake scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; buildInputs = [ cairo pango gtk libnotify wayland glib ]; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 6f8dd068de8..da822f5347b 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee +{ lib, stdenv, fetchurl, gettext, pkg-config, glib, libnotify, gtk3, libgee , keybinder3, json-glib, zeitgeist, vala, gobject-introspection }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gettext vala + pkg-config gettext vala # For setup hook gobject-introspection ]; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index ab57bf7a430..15ef1654e70 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: buildGoPackage rec { pname = "syncthing-tray"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 993606d39c0..c480c7a8e2f 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig, Security, stdenv }: +{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkg-config, Security, stdenv }: rustPlatform.buildRustPackage rec { pname = "taizen"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index eb49853885b..44c46f74655 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco , qtbase, qtwebengine, qtx11extras, sqlite }: @@ -68,7 +68,7 @@ let sourceRoot = "source/src"; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; postPatch = '' @@ -93,7 +93,7 @@ let ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ bugsnag-qt diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index 7c089d830e0..5aaec7a1e60 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, intltool, pkgconfig +{ stdenv, fetchurl, itstool, intltool, pkg-config , libxml2, gnome2, atk, gtk2, glib , mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 , makeWrapper, lib}: @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ itstool intltool libxml2 gnome2.GConf atk gtk2 mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 70568f92383..3b9b09aaba9 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -5,7 +5,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , python3 , libgee , gsettings-desktop-schemas @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 69f58b828c4..b7974966be4 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }: mkDerivation { name = "twmn-git-2018-10-01"; @@ -10,7 +10,7 @@ mkDerivation { sha256 = "0mpjvp800x07lp9i3hfcc5f4bqj1fj4w3dyr0zwaxc6wqmm0fdqz"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtbase qtx11extras boost ]; postPatch = '' diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 1da61f9dcb0..e83a5e9a2c7 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: +{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib udev ]; configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index d44e49f77cf..15bda9d5f97 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: with lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkgconfig yasm ]; + nativeBuildInputs = [ makeself pkg-config yasm ]; buildInputs = [ fuse lvm2 wxGTK ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index be354d60dc4..9f27f8e73d7 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgnomeui libxml2 ]; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 4cf13c9c7aa..18d190a9dd6 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, pkgconfig +, pkg-config , ncurses, libX11 , util-linux, file, which, groff @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 7fd5b34ee3b..61ebfb0fcc6 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, makeWrapper -, pkgconfig, intltool, gettext, gtk2, expat, curl +, pkg-config, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, gpsbabel, expect , withMapnik ? false, mapnik @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 ] ++ lib.optional withMapnik mapnik diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index c565bfe0ce3..d70918f2e7c 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg +, pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index d198a15c252..b4591d8717c 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, pkgconfig, qmake, qtscript, qtsvg }: +{ lib, stdenv, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: mkDerivation rec { pname = "vym"; @@ -32,7 +32,7 @@ mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtscript qtsvg ]; postInstall = '' diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index bbccf7fee22..c1616c739c9 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 @@ -21,7 +21,7 @@ }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook cmake + meson ninja pkg-config scdoc wrapGAppsHook cmake ] ++ lib.optional withMediaPlayer gobject-introspection; propagatedBuildInputs = lib.optionals withMediaPlayer [ diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index ccd1e229902..7e0fbb999f5 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, pcre, json-glib }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, pcre, json-glib }: stdenv.mkDerivation rec { pname = "wmc-mpris"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1zcnaf9g55cbj9d2zlsr0i15qh0w9gp5jmxkm6dcp1j6yd7j3ymc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib pcre json-glib ]; cmakeFlags = [ "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts" diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 113b674f862..6b63fde222f 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, wrapGAppsHook -, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig +, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkg-config , libICE, libSM, libXScrnSaver, libXtst, cheetah , gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo , cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook + autoconf autoconf-archive automake gettext intltool libtool pkg-config wrapGAppsHook ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index bf6b37b1028..9e05e09caef 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config , libtool, openssl, qtbase, qttools }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { buildInputs = [ libtool openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkgconfig qttools ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index c9a2e3b36ae..17e58cb54d7 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: +{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.42"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 13bda4f2332..10034fbe1b1 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{lib, stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: +{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: stdenv.mkDerivation rec { name = "xfontsel-1.0.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libX11 makeWrapper libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index efdd7f2b0f1..01706011e2d 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook wafHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 9c3795ef394..bb4e1727f69 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook + pkg-config intltool wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index acb1cbf90e3..dbb5eb42e1d 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoreconfHook, pkgconfig, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook , glib, intltool, gtk3, gtksourceview }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ glib intltool gtk3 gtksourceview ]; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index d2cc2bf7ad1..ba798a861a8 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libXt }: +{ lib, stdenv, fetchurl, pkg-config, libXt }: stdenv.mkDerivation rec { pname = "xscope"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt ]; meta = with lib; { diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index a5bd8a02ebf..93e56f1df2d 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , glib, libwnck3, procps }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ glib libwnck3 ]; postInstall = '' diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index d20489d37f3..a664aec45e1 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: +{ stdenv, lib, fetchFromGitHub, pkg-config, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: let makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; }; - nativeBuildInputs = [ pkgconfig flex bison ]; + nativeBuildInputs = [ pkg-config flex bison ]; buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 36fd685b799..7a0111785c1 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep -, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig +, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config }: assert svgSupport -> - librsvg != null && glib != null && gdk-pixbuf != null && pkgconfig != null; + librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; stdenv.mkDerivation rec { name = "xxkb-1.11.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 6c03bbc33b3..3046638ec4a 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }: +{ stdenv, fetchurl, lib, qt4, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "yate"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # TODO zaptel ? postgres ? - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 openssl ]; # /dev/null is used when linking which is a impure path for the wrapper diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 4e2d16819ba..69ecb1cfd1b 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core , girara, gettext, libarchive }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; buildInputs = [ libarchive zathura_core girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index c56f42691f7..5690dc0db10 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig +{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkg-config , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ - meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx + meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx gettext wrapGAppsHook libxml2 check appstream-glib ]; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index a5ed7ab6781..f0fe0948632 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { pname = "zathura-djvu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 97f36f82847..d787705be15 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -7,7 +7,7 @@ , libjpeg , mupdf , openjpeg_2 -, pkgconfig +, pkg-config , zathura_core }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ cairo diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index bafa293ad9c..b76e72a6970 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, poppler }: stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"; }; - nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; + nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; buildInputs = [ poppler girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 05cc570eb8f..ee63a9df53b 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { pname = "zathura-ps"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; buildInputs = [ libspectre zathura_core girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 123c3cc08a6..d271f22e67c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -2,7 +2,7 @@ , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: -{ lib, stdenv, pkgconfig, pango, perl, python3, zip +{ lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, nss_3_53 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper @@ -222,7 +222,7 @@ buildStdenv.mkDerivation ({ llvmPackages.llvm # llvm-objdump nodejs perl - pkgconfig + pkg-config python3 rust-cbindgen rustc diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index e634b0f566f..917da034c30 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook , help2man, luafilesystem, luajit, sqlite , webkitgtk, gtk3, gst_all_1, glib-networking }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig help2man wrapGAppsHook + pkg-config help2man wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 7bda7cdcbf7..713f934f778 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages -, fetchurl, pkgconfig, ncurses, gzip +, fetchurl, pkg-config, ncurses, gzip , sslSupport ? true, openssl ? null , nukeReferences }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] - ++ lib.optional sslSupport pkgconfig; + ++ lib.optional sslSupport pkg-config; buildInputs = [ ncurses gzip ] ++ lib.optional sslSupport openssl.dev; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 7ea22641126..2a4dc9e389a 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -4,7 +4,7 @@ , graphicsSupport ? !stdenv.isDarwin, imlib2 ? null , x11Support ? graphicsSupport, libX11 ? null , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null -, perl, man, pkgconfig, buildPackages, w3m +, perl, man, pkg-config, buildPackages, w3m }: assert sslSupport -> openssl != null; @@ -18,7 +18,7 @@ let mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; inherit (w3m) src; - nativeBuildInputs = [ pkgconfig boehmgc ]; + nativeBuildInputs = [ pkg-config boehmgc ]; makeFlags = [ "mktable" ]; installPhase = '' install -D mktable $out/bin/mktable @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { sed -ie 's!mktable.*:.*!mktable:!' Makefile.in ''; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ ncurses boehmgc zlib ] ++ optional sslSupport openssl ++ optional mouseSupport gpm-ncurses diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index d163f8a7475..e6d4845761a 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , libhandy_0 , modemmanager , gtk3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils vala wrapGAppsHook diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index e23f94634de..445ee89d5cd 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -10,7 +10,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , dconf , gst_all_1 , wrapGAppsHook @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config wrapGAppsHook python3 gobject-introspection # for setup hook diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 50f2ab14a77..c833dea21c7 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: buildGoPackage rec { pname = "docker-machine-kvm"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 49e59ab7093..8c3534006bf 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkg-config, cctools, Hypervisor, vmnet }: buildGoPackage rec { pname = "docker-machine-xhyve"; @@ -26,7 +26,7 @@ buildGoPackage rec { sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Hypervisor vmnet ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 9abaeef8013..f9b67b6821a 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config , libsodium, libarchive, openssl, zeromq }: rustPlatform.buildRustPackage rec { @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libarchive openssl zeromq ]; cargoBuildFlags = ["--package hab"]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index af92920645e..4f3dfcfc03f 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, bash , coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 }: @@ -34,7 +34,7 @@ let outputHash = dependencies-sha256; }; - nativeBuildInputs = [ maven cmake pkgconfig ]; + nativeBuildInputs = [ maven cmake pkg-config ]; buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated postPatch = '' diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c35579def7e..5a7d953a069 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -11,7 +11,7 @@ , runc , kmod , libseccomp -, pkgconfig +, pkg-config , ethtool , util-linux , ipset @@ -128,7 +128,7 @@ let patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkgconfig ]; + nativeBuildInputs = [ git pkg-config ]; buildInputs = [ libseccomp ]; buildPhase = '' @@ -168,7 +168,7 @@ let patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkgconfig ]; + nativeBuildInputs = [ git pkg-config ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index f9391373b18..5b3b17b3df2 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkg-config, makeWrapper , glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs , lvm2, docker-machine-kvm }: @@ -21,7 +21,7 @@ in buildGoPackage rec { sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa"; }; - nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; + nativeBuildInputs = [ pkg-config go-bindata makeWrapper ]; buildInputs = [ glib gtk3 libappindicator-gtk3 gpgme ostree libselinux btrfs-progs lvm2 ]; goPackagePath = "github.com/minishift/minishift"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 3caab38a3ef..6efdf77bfce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config, makeWrapper, cdrtools }: # USAGE: # install the following package globally or in nix-shell: @@ -30,7 +30,7 @@ buildGoPackage rec { sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ libvirt ]; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 6aec4540147..f0f09c8de7e 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , glib , ronn , curl @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # See comment on locale above glibcLocales autoreconfHook - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 2df2b9ce786..d550a126547 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + meson ninja pkg-config vala gettext appstream-glib desktop-file-utils libxml2 python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index a24105f8315..4c47c316753 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -7,7 +7,7 @@ , libfilezilla , libidn , nettle -, pkgconfig +, pkg-config , pugixml , sqlite , tinyxml @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 335b94cd2f4..a359bf3a7c0 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, vala , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3beb431042a..17ace3021d8 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper +{lib, stdenv, pkg-config, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper , libtirpc }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73"; }; - buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 40dbbddbb3e..00f6aee0915 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -3,7 +3,7 @@ , fetchurl , clang , llvm -, pkgconfig +, pkg-config , makeWrapper , file , hyperscan @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { clang llvm makeWrapper - pkgconfig + pkg-config ] ++ lib.optionals rustSupport [ rustc cargo ] ; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index d947fa76dff..77a7dcca747 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 , gsm, speex, portaudio, spandsp, libuuid, libvpx }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "13di0ycdcr2q2a20mjvyaqfmvk5xldwqaxklqsz7470jnbc5n0rb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid libvpx diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 4af62e05c93..543a5f52c97 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: with lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bitlbee ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 76cf10e7b14..8023c70fe5f 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, json-glib }: with lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ bitlbee json-glib ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index ce94ab62659..f1b2df658a6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: with lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bitlbee ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 57ea99ee921..14464247659 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, libgcrypt }: with lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bitlbee autoconf automake libtool libgcrypt ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 022fde67365..1a83a04a1fa 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; buildInputs = [ gnutls libotr python ] ++ optional enableLibPurple pidgin diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 617c02de263..f9789cfda41 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: +{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: mkDerivation rec { pname = "chatterino2"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index d16ad19428f..0de7e264ec4 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, +{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 8e6725d6067..0474f21a2b9 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext +, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { vala cmake ninja - pkgconfig + pkg-config wrapGAppsHook gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 2fe770e56eb..4c28e346a12 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub -, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: stdenv.mkDerivation rec { pname = "freetalk"; version = "4.1"; - + src = fetchFromGitHub { owner = "GNUFreetalk"; repo = "freetalk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 1344440eafc..a3df74a0016 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -36,7 +36,7 @@ , openldap , ortp , pango -, pkgconfig +, pkg-config , python , qtbase , qtgraphicaleffects @@ -125,7 +125,7 @@ mkDerivation rec { graphviz intltool makeWrapper - pkgconfig + pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 8e5642855a3..7c5bff94084 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr +{ lib, stdenv, fetchurl, openssl, ncurses, pkg-config, glib, loudmouth, libotr , gpgme }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index bcf3279d6a0..3b6b9bfc6f9 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub -, qmake, pkgconfig, olm, wrapQtAppsHook +, qmake, pkg-config, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects , python3Packages, pyotherside, libXScrnSaver }: @@ -23,7 +23,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook python3Packages.wrapPython ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ]; buildInputs = [ qtbase qtmultimedia diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index a26d3c41b22..48adc6f03cf 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -19,7 +19,7 @@ , spdlog , fmt , olm -, pkgconfig +, pkg-config , nlohmann_json }: @@ -37,7 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ lmdbxx cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 2bb347611b8..46f8458f153 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : +{ lib, stdenv, libxml2, pidgin, pkg-config, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "pidgin-carbons"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 pidgin ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 2127fe7ff5b..1250e3877b9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkg-config]; buildInputs = [gtk2 glib pidgin]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index b2a20319213..a168eb984c3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, pidgin } : +{ lib, stdenv, fetchgit, pkg-config, pidgin } : let version = "54b2992"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index f72dd198b60..9af8b0aff77 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, glib, json-glib, nss, nspr +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, glib, json-glib, nss, nspr , libsecret } : @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ pidgin glib json-glib nss nspr libsecret diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 59afb8bd65b..d7c3c6cacab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */skypeweb) ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 8128d0af7b7..10cbcb6c1d2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation { pname = "purple-discord"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 75be98506ae..2862e4df796 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-O3" "-Wno-error" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 547cd2b1427..9f5f9a2bda1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pidgin, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pidgin, pkg-config }: stdenv.mkDerivation { pname = "purple-slack-unstable"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1sksqshiwldd32k8jmiflp2pcax31ym6rypr4qa4v5vdn907g80m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index c53ad0e2b3f..6e14ee1a2b8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus +{ lib, stdenv, fetchurl, pkg-config, pidgin, libnotify, gdk-pixbuf, glib, dbus , dbus-glib }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index a5593624691..527af9ed98d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } : let version = "1.3.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index c956864b83d..65b9c245a38 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtk2-x11 +{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11 , gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream @@ -44,7 +44,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (stdenv.isDarwin) gtk2-x11); - propagatedBuildInputs = [ pkgconfig gettext ] + propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) ++ (lib.optional (stdenv.isLinux) gtk2) ++ (lib.optional (stdenv.isDarwin) gtk2-x11); diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 8dc70d6d792..df6e675fecb 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder -, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig, setuptools }: +, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkg-config, setuptools }: buildPythonApplication rec { pname = "poezio"; version = "0.13.1"; @@ -8,7 +8,7 @@ buildPythonApplication rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 2ea7c9502c2..4c059cb20d8 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, +{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, fetchgit }: let @@ -19,7 +19,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ trousers gtk3 gtkspell3 ] ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ lib.optionals gui [ wrapGAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 4630a37781f..c373d23948b 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkgconfig + autoreconfHook autoconf-archive glibcLocales pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 322da86071c..2a234edaa08 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, makeDesktopItem +{ mkDerivation, lib, stdenv, fetchurl, pkg-config, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: @@ -27,7 +27,7 @@ mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 420ab1a53b3..bad54f455b0 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -2,7 +2,7 @@ , fetchgit , which , autoreconfHook -, pkgconfig +, pkg-config , automake , libtool , pjsip @@ -89,7 +89,7 @@ stdenv.mkDerivation { autoreconfHook automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index b80d5128748..83cc80ccaf0 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, glib, ncurses +{ lib, stdenv, fetchurl, perl, pkg-config, glib, ncurses , enablePlugin ? false }: # Enabling the plugin and using it with a recent irssi, segafults on join: @@ -27,7 +27,7 @@ stdenv.mkDerivation { configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl glib ncurses ]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 494a1f267f9..1dadc728eee 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qttools, sconsPackages +{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qttools, sconsPackages , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: @@ -14,7 +14,7 @@ mkDerivation rec { patches = [ ./qt-5.11.patch ./scons.patch ]; - nativeBuildInputs = [ pkgconfig qttools sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ]; buildInputs = [ GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8ea4362e7e3..20da2a65dc2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, callPackage -, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo +, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell @@ -41,7 +41,7 @@ in mkDerivation rec { dontWrapGApps = true; dontWrapQtApps = true; - nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; + nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index b4a4e8df0f6..3fe88c287c5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkg-config libxslt ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; checkInputs = [ dbus.daemon ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index baa16c98e07..74e4d1039e7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkg-config libxslt ]; patches = [ # Patch from Gentoo that helps telepathy-haze build with more diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 95be1b07375..bc66d77e224 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ]; preFixup = '' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 336bde0bb48..bae29f4b31f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig intltool libxslt gobject-introspection + makeWrapper pkg-config intltool libxslt gobject-introspection ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index dc0a16139ea..cf166f7e2d3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup -, libuuid, openssl, pcre, sqlite, pkgconfig }: +, libuuid, openssl, pcre, sqlite, pkg-config }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl sqlite pcre telepathy-glib.python ]; - nativeBuildInputs = [ libxslt pkgconfig ]; + nativeBuildInputs = [ libxslt pkg-config ]; configureFlags = [ "--disable-avahi-tests" ]; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 51c05523160..e59e5864432 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl -, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus +, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut qrencode ]; - nativeBuildInputs = [ pkgconfig libconfig ]; + nativeBuildInputs = [ pkg-config libconfig ]; meta = with lib; { description = "Reference CLI for Tox"; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 01f2b9c5644..668e614c474 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, check, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, check, cmake, pkg-config , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 19f398bc59a..2a91e3ebddc 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3 , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 9061ac34fe3..91617a26782 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; configureFlags = [ diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 5c1c9743621..d3b814fb161 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: stdenv.mkDerivation rec { name = "fish-irssi-20130413-e98156bebd"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp src/.libs/libfish.so $out/lib/irssi/modules ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp automake autoconf libtool openssl glib ]; meta = { diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index 6fd66096b5b..cfc03fe37d3 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras -, pkgconfig, cmake, gettext +, pkg-config, cmake, gettext }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig cmake gettext + pkg-config cmake gettext ]; meta = with lib; { diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 188d19d5968..643941b5fa8 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, lib, stdenv }: +{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv }: stdenv.mkDerivation rec { pname = "libcoap"; version = "4.2.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { autoconf which libtool - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; configureFlags = [ diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 2570e425ae7..2f9832d9193 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -15,7 +15,7 @@ , libnotify , libsecret , openssl -, pkgconfig +, pkg-config , webkitgtk , wrapGAppsHook }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 975ace086f5..b745a842b9f 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ { lib, config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkgconfig, poppler, python, shared-mime-info +, openldap, perl, pkg-config, poppler, python, shared-mime-info , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook python.pkgs.wrapPython ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix index 3a828b631a3..d5223092446 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix @@ -1,7 +1,7 @@ { lib, config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex , curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme , libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk +, openldap, perl, pkg-config, poppler, python, shared-mime-info, webkitgtk , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config wrapGAppsHook python.pkgs.wrapPython ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index a097fd0dd8a..b2ec2a743f3 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, pkgconfig +, pkg-config , gobject-introspection , pango , cairo @@ -24,7 +24,7 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 0f1f2e52d85..878b778c5a5 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +{ lib, stdenv, fetchurl, pkg-config, lua, file, ncurses, gmime, pcre-cpp , perl, perlPackages, makeWrapper , debugBuild ? false , alternativeGlobalConfigFilePath ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ lua file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 519448c3ade..2ced5e60db4 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -2,7 +2,7 @@ , lib , fetchgit , rustPlatform -, pkgconfig +, pkg-config , openssl , dbus , sqlite @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkgconfig gzip makeWrapper ]; + nativeBuildInputs = [ pkg-config gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 1f7bbf5c712..5c979bde604 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext, openssl }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl gettext ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index fcb92d3fcc1..64ebb78a12d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, notmuch }: let version = "9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib notmuch ]; installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 59c7b6bf9d4..c39654d1c29 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchgit, lib, stdenv -, pkgconfig, gnupg +, pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo , pythonPackages @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index de248faace7..fc8c83f216c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, notmuch, openssl, pkgconfig, sqlite, xapian, zlib +, notmuch, openssl, pkg-config, sqlite, xapian, zlib }: stdenv.mkDerivation rec { version = "5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz"; sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ notmuch openssl sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 1b6cc50ffdf..5caaa9ce6e1 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null +{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null , gpgSupport ? true, sslSupport ? true }: assert gpgSupport -> gpgme != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] ++ optionals gpgSupport [ gpgme ] diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index ec26384261f..f3594d97801 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -37,7 +37,7 @@ , nss , pango , perl -, pkgconfig +, pkg-config , python2 , python3 , runtimeShell @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { nasm nodejs perl - pkgconfig + pkg-config python2 python3 rust-cbindgen diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ab4078d6a0d..e758249a71c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -38,7 +38,7 @@ , nss_3_53 , pango , perl -, pkgconfig +, pkg-config , python2 , python3 , runtimeShell @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { nasm nodejs perl - pkgconfig + pkg-config python2 python3 rust-cbindgen diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 51f6b4e0622..d7c7320b9e4 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -10,7 +10,7 @@ , libsecret , mimetic , mkDerivation -, pkgconfig +, pkg-config , qgpgme , qtbase , qtkeychain @@ -59,7 +59,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config qttools gnupg ]; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 2b4dabbedc5..da36589aeec 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, pkgconfig +, pkg-config , python3 , fetchFromGitLab , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config python3 perlPackages.Po4a itstool diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index bfc928cfbc6..42486458b2c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -7,7 +7,7 @@ , libsecret , openssl , pcre -, pkgconfig +, pkg-config , qtbase , qtkeychain , qttools @@ -33,7 +33,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 943947f389e..626913cd60a 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: +{ lib, stdenv, fetchFromGitHub, libconfig, pkg-config, libevent, openssl }: stdenv.mkDerivation { pname = "nntp-proxy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libconfig libevent openssl ]; installFlags = [ "INSTALL_DIR=$(out)/bin/" ]; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index a2d614ff542..40240565973 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja vala_0_40 - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index fa8609ef532..7c3c23a89ee 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -8,7 +8,7 @@ , grpc , protobuf , openssl -, pkgconfig +, pkg-config , c-ares , abseil-cpp , libGL @@ -51,7 +51,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake clang - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index fb0c0a18ac5..3e58e83143f 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 1a9073056e7..4e83f36ea52 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, fribidi +{ lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl , boost, libxslt, goffice, wrapGAppsHook, gnome3 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace 'enchant >=' 'enchant-2 >=' ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index aefa786d060..0e151f3adbe 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 +{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, gtk3 , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index ea5ae8fb0a2..8ea277e1af3 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee +{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , appstream, desktop-file-utils }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index ff40d944c83..d49ee41c9f5 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , desktop-file-utils , python3 , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 6dc46d9dec6..7798026e790 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -4,7 +4,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , vala @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 594c95d3d95..808811e20e8 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , extra-cmake-modules , libX11 , libXi @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ extra-cmake-modules - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 2893271dc6f..6bca8f2e9e6 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, makeWrapper, cmake, gtest +{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n"; }; - nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [ boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index f52f9a3e909..4bf3081cde1 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,7 +1,7 @@ { fetchurl , lib, stdenv , gtk -, pkgconfig +, pkg-config , libgsf , libofx , intltool @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libgsf diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a0df7144114..03c9445fe24 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook , libsoup, gnome3 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix index 8a40a3f4f69..3b1700cc24f 100644 --- a/pkgs/applications/office/ktimetracker/default.nix +++ b/pkgs/applications/office/ktimetracker/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, pkgconfig, extra-cmake-modules, +{ mkDerivation, lib, fetchurl, cmake, pkg-config, extra-cmake-modules, kconfig, kconfigwidgets, kdbusaddons, kdoctools, ki18n, kidletime, kjobwidgets, kio, knotifications, kwindowsystem, kxmlgui, ktextwidgets, kcalendarcore @@ -14,11 +14,11 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig extra-cmake-modules + cmake pkg-config extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets + kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets kio knotifications kwindowsystem kxmlgui ktextwidgets kcalendarcore ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6d8983179dc..7b3e630233f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, clucene_core, libcdr, lcms , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, bluez5, libtool, carlito +, fontsConf, pkg-config, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -386,7 +386,7 @@ in (mkDrv rec { ''; nativeBuildInputs = [ - gdb fontforge autoconf automake bison pkgconfig libtool + gdb fontforge autoconf automake bison pkg-config libtool ] ++ lib.optional (!kdeIntegration) wrapGAppsHook ++ lib.optional kdeIntegration wrapQtAppsHook; @@ -399,7 +399,7 @@ in (mkDrv rec { libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU libGL mythes glib libmysqlclient - neon nspr nss openldap openssl pam perl pkgconfig poppler + neon nspr nss openldap openssl pam perl pkg-config poppler python3 sane-backends unzip which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index a7aceb1e1cf..7ab5bc838ec 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , vala_0_46 , cmake , ninja @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 vala_0_46 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 3513e44ed0c..77cc087c66b 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify +{ lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19h3dnjgqbawnvgnycyp4n5b6mjsp5zghn3b69b6f3xa3fyi32qy"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive gspell webkitgtk libgringotts ]; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 6326df87ed2..b6d0d373f35 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst +{ fetchurl, lib, stdenv, pkg-config, autoconf, automake, clutter, clutter-gst , gdk-pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf cairo clutter-gtk ]; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index dab567db898..0df6070319d 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , intltool , automake111x , autoconf @@ -25,7 +25,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = with gnome2; [ - pkgconfig + pkg-config intltool automake111x autoconf diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 88212b7d8d9..a6427d0f890 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 +{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt4, python2, cups, fontconfig, libjpeg , zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = with xorg; [ freetype lcms libtiff libxml2 libart_lgpl qt4 pythonEnv cups fontconfig diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 8745dd37c98..7f4054bfb4e 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -14,7 +14,7 @@ , libxml2 , mkDerivation , pixman -, pkgconfig +, pkg-config , podofo , poppler , poppler_data @@ -45,7 +45,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index f40bc44e6eb..28e35d08e91 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -9,7 +9,7 @@ , gettext , ninja , pantheon -, pkgconfig +, pkg-config , json-glib , libgudev , libevdev @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmake gettext ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index fa70fdd3082..9c9df892a04 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -8,7 +8,7 @@ , libgee , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , wrapGAppsHook @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala python3 wrapGAppsHook diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 64091d7b50a..6b49a27a08a 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , python3Packages -, pkgconfig +, pkg-config , librsvg , gobject-introspection , atk @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index b5589fcbdeb..0b086160e50 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper , lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontConfigure = true; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper ninja ]; diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index f006eeb6756..6299fe21d29 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, cmake , pkgconfig, libusb1 +, cmake , pkg-config, libusb1 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libusb1 ]; cmakeFlags = diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 8ba372e46fb..7e346bcbf84 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: + pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 0fb7317428e..e74cc551d49 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , mpg123, SDL2, gnome3, faad2, pcre } : @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ]; diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix index 04d1e6056de..a288d93b40a 100644 --- a/pkgs/applications/radio/dabtools/default.nix +++ b/pkgs/applications/radio/dabtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, fftw } : @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "18nkdybgg2w6zh56g6xwmg49sifalvraz4rynw8w5d8cqi3dm9sm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr fftw libusb1 ]; meta = with lib; { diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index f97ffb4d807..65afdccf812 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , libbladeRF , libusb1 , ncurses @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbladeRF diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 349999b1eef..51728bfb403 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { version = "4.1.17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio - libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; + libsndfile libsamplerate libpulseaudio pkg-config alsaLib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 270494110d7..b0983c811e1 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index bbde8555547..0f75f704af3 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 36b0b216598..276581d80e5 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index f0f16f1e8c9..7471d6676ed 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 76cfa5f414b..a8f96fac44a 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -4,7 +4,7 @@ , cmake # Remove gcc and python references , removeReferencesTo -, pkgconfig +, pkg-config , cppunit , swig , orc @@ -53,7 +53,7 @@ let basic = { native = [ cmake - pkgconfig + pkg-config orc ]; runtime = [ boost log4cpp mpir ]; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 0bc8675690f..e99a1bfd7a1 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -4,7 +4,7 @@ , cmake # Remove gcc and python references , removeReferencesTo -, pkgconfig +, pkg-config , cppunit , swig , orc @@ -53,7 +53,7 @@ let basic = { native = [ cmake - pkgconfig + pkg-config orc ]; runtime = [ diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index a01fab4975a..afe3de64527 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio , pythonSupport ? true, python, swig, limesuite, log4cpp } : @@ -20,7 +20,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ] ++ lib.optionals pythonSupport [ swig ]; buildInputs = [ diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 41df55a890d..98dce802c5c 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, fftwSinglePrec }: stdenv.mkDerivation rec { pname = "hackrf"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index cf4ddd5b6e8..37131a686b5 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -1,7 +1,7 @@ { lib , mkDerivation , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , boost , fftwFloat @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ fftwFloat boost diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index dc6b1325cf1..5792031c802 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: stdenv.mkDerivation { name = "kalibrate-hackrf-unstable-20160827"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw hackrf libusb1 ]; diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 536e83297c3..255938b11d5 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { name = "kalibrate-rtl-20131214"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with lib; { diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 0b0f8f2f0cc..48068a342e2 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, libtool , fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql"; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; preConfigure = '' diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index 2e333e462c6..d92cf9e25cd 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, +{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config ]; buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index 9f917329168..7fd37d21fe1 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, rtl-sdr }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, rtl-sdr }: stdenv.mkDerivation { name = "rtl-ais"; version = "0.8.1"; - buildInputs = [ pkgconfig rtl-sdr libusb1 ]; + buildInputs = [ pkg-config rtl-sdr libusb1 ]; src = fetchFromGitHub { owner = "dgiardini"; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 0b5381fb601..2fe57eaf296 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchpatch, cmake, pkgconfig, libusb1 }: +{ lib, stdenv, fetchgit, fetchpatch, cmake, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn"; }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 ]; # TODO: get these fixes upstream: diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 6f4460e6d6e..b926e29bc47 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, soapysdr-with-plugins }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 96f6df2744b..b4a6cb775cc 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -19,7 +19,7 @@ libbladeRF, mkDerivation, ocl-icd, opencv3, -pkgconfig, +pkg-config, qtbase, qtmultimedia, qtserialport, @@ -42,7 +42,7 @@ mkDerivation rec { fetchSubmodules = false; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index db9ad67ad40..9c0ad38eb59 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libbladeRF, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "02wh09850vinqg248fw4lxmx7y857cqmnnb8jm9zhyrsggal0hki"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 105f0f423f4..8fe3dc90008 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , hackrf, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 4be9e20d1f5..855213fc514 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , rtl-sdr, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 87f69377c62..ea8c8fad106 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb-compat-0_1, pkgconfig +, libusb-compat-0_1, pkg-config , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "102wnpjxrwba20pzdh1vvx0yg1h8vqd8z914idxflg9p14r6v5am"; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index f2688db4ad1..19e635da5ac 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, pkgconfig, fetchFromGitHub, makeDesktopItem, alsaLib, speex +{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsaLib, speex , libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools , wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ]; dontWrapQtApps = true; - nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config doxygen groff wrapQtAppsHook ]; buildInputs = [ alsaLib diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index a9fd0102dd1..91a07496ce9 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkg-config, glib , perl, ncurses5, hamlib, xmlrpc_c }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; - nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; + nativeBuildInputs = [ autoreconfHook autoconf automake pkg-config perl ]; buildInputs = [ glib ncurses5 hamlib xmlrpc_c ]; configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ]; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 4645ae881a8..bafb2f637df 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchFromGitHub , cmake -, pkgconfig +, pkg-config # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations , boost , enableLibuhd_C_api ? true @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ] # If both enableLibuhd_Python_api and enableUtils are off, we don't need # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index ec449517fcf..5e299cc5984 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: +{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkg-config, qt5}: stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [libpulseaudio alsaLib pkgconfig qt5.qtbase]; + buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; meta = with lib; { diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 87c04dd3b98..be154d6cee3 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let @@ -17,7 +17,7 @@ in mkDerivation { sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index debbaf0606f..697a28e4be9 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; # Hamlib builds with autotools, wsjtx builds with cmake - # Omitting pkgconfig because it causes issues locating the built hamlib + # Omitting pkg-config because it causes issues locating the built hamlib nativeBuildInputs = [ asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool qttools texinfo wrapQtAppsHook diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 04797140b02..eb57048c5c2 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; version = "2.0.19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - buildInputs = [ glib pkgconfig gtk2 hamlib ]; + buildInputs = [ glib pkg-config gtk2 hamlib ]; meta = with lib; { description = "An amateur radio logging program"; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8c8a0c1c3f6..da3c25def3f 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig +{ stdenv, lib, fetchurl, cmake, pkg-config , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = - [ yasm cmake pkgconfig ] + [ yasm cmake pkg-config ] ++ lib.optional withQT wrapQtAppsHook; buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index f326965ce44..3fd25bdf73d 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango , avxeditSupport ? false, qt4 ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { "--with-jpeg=${libjpeg.out}/lib" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] ++ optional avxeditSupport qt4; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 4554bea6157..2a732ffa184 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: +{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg, glew, libass, openal, qtbase }: mkDerivation rec { pname = "bino"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg glew libass openal qtbase ]; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 7e366da4378..8d6df2c4904 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fetchpatch , scons , boost @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); - nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; + nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; buildInputs = [ boost diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 705bac06eb6..69d27c3a2c8 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index bc2ac4e4ef2..881e6b687ef 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , glew, glfw3, leptonica, libiconv, tesseract3, zlib }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ lib.optional (!stdenv.isLinux) libiconv; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index b59a40c03a2..57eaf91f2ae 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -5,7 +5,7 @@ , ninja , python3 , gettext -, pkgconfig +, pkg-config , desktop-file-utils , wrapGAppsHook , appstream-glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { python3 appstream-glib gettext - pkgconfig + pkg-config desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 8d6ff8e5a00..bfc577e51a2 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 +, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ automake - autoconf libtool pkgconfig file + autoconf libtool pkg-config file faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 5afcab12a08..09289840030 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp ${automake}/share/automake-*/mkinstalldirs . ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6ea3a53a0af..502c4c69c3f 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config , flex, bison }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ ./dvdauthor-0.7.1-automake-1.13.patch diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 8ca3be19e5a..6366a222722 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , flex, bison, gettext , xineUI, wxSVG , fontconfig @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig ]; + [ pkg-config ]; packagesToBinPath = [ cdrtools dvdauthor dvdplusrwtools ]; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 88dfe5b4b87..de56865410e 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib +{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 906d119dfc5..6597b5fbffe 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 16db55f060d..6317d7b1ab3 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchFromGitHub, # Main build tools - pkgconfig, autoconf, automake, libtool, m4, lzma, python3, + pkg-config, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -93,7 +93,7 @@ _EOF ''); nativeBuildInputs = [ - pkgconfig autoconf automake libtool m4 python3 + pkg-config autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 13beb768d7b..5f12dd6494b 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -51,7 +51,7 @@ #AMR-WB IF2 support no { lib, stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv -, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext +, pkg-config, perlPackages, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -64,7 +64,7 @@ stdenv.mkDerivation { }; buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages + pkg-config libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--enable-local-ffmpeg=no" ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 4726c1b7b51..3aaa465a3cc 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders -, pkgconfig, cmake, gnumake, yasm, python2Packages +, pkg-config, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which @@ -99,11 +99,11 @@ let "-DCROSSCOMPILING=ON" "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkgconfig" + "-DPKG_CONFIG_EXECUTABLE=pkg-config" ]; buildInputs = [ libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkgconfig gnutls ]; + nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; }; # We can build these externally but FindLibDvd.cmake forces us to build it @@ -114,7 +114,7 @@ let rev = "${version}-${rel}-Beta-5"; sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; buildInputs = [ linuxHeaders ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' rm -rf msvc @@ -133,7 +133,7 @@ let rev = "${version}-${rel}-Alpha-3"; sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; buildInputs = [ libdvdcss libdvdread ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = cmakeProtoPatch; postInstall = '' mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so @@ -146,7 +146,7 @@ let rev = "${version}-${rel}-Alpha-3"; sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; buildInputs = [ libdvdcss ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; configureFlags = [ "--with-libdvdcss" ]; postPatch = cmakeProtoPatch; }; @@ -208,7 +208,7 @@ in stdenv.mkDerivation { doxygen makeWrapper which - pkgconfig gnumake + pkg-config gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 jre_headless yasm gettext python2Packages.python flatbuffers diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 365fb1ea417..ad9a77af080 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: +{ mkDerivation, lib, fetchgit, pkg-config, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: mkDerivation rec { version = "0.8.5"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ]; postPatch = '' diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 284cc4ae58a..6bca33eb388 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -6,7 +6,7 @@ , liblo , gst_all_1 , qmake -, pkgconfig +, pkg-config , wrapQtAppsHook }: @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 3fed91bd961..5735771b5d3 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake +{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoconf automake gettext + pkg-config autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index b3732647162..53db96e31d4 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ffmpeg libjpeg libmicrohttpd ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 757aa42682a..4e245b70d4f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg_3 +{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3 , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig yasm ]; + nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; [ freetype ffmpeg_3 ] ++ optional aalibSupport aalib diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 05025cb304f..d4fc07d1a2e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, fetchpatch -, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which +, addOpenGLRunpath, docutils, perl, pkg-config, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer @@ -152,7 +152,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ - addOpenGLRunpath docutils perl pkgconfig python3 wafHook which + addOpenGLRunpath docutils perl pkg-config python3 wafHook which ] ++ optional swiftSupport swift; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 020c38c8b57..1b5404fede1 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, glib, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib mpv-unwrapped ]; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 5a789654644..bd8eb26895c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype -, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders }: @@ -27,9 +27,9 @@ mkDerivation rec { perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; - nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; - configureFlags = + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; meta = with lib; { diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index c9486edd250..a455869ebf9 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, +{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio, qmake4Hook, libpng, libGL, lndir }: @@ -50,7 +50,7 @@ let ({ pluginName = "arena"; sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango librsvg librevenge libcdr opencolorio libxml2 libzip poppler imagemagick @@ -66,7 +66,7 @@ let ({ pluginName = "io"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ffmpeg_3 openexr opencolorio openimageio boost libGL seexpr @@ -93,7 +93,7 @@ stdenv.mkDerivation { sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp"; }; - nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ]; + nativeBuildInputs = [ qmake4Hook pkg-config python2Packages.wrapPython ]; buildInputs = [ qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index af4e11ef0dd..f0722b52532 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -19,7 +19,7 @@ , curl , xorg , makeWrapper -, pkgconfig +, pkg-config , libvlc , mbedtls @@ -50,7 +50,7 @@ in mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; buildInputs = [ curl diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index eba1508387b..47f6ea9e5dd 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -6,7 +6,7 @@ # mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit { stdenv, fetchhg, wayland, obs-studio -, meson, ninja, pkgconfig, libX11 +, meson, ninja, pkg-config, libX11 , dmabufSupport ? false, libdrm ? null, libGL ? null, lib}: assert dmabufSupport -> libdrm != null && libGL != null; @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0qrcf8024r4ynfjw0zx8vn59ygx9q5rb196s6nyxmy3gkv2lfxlq"; }; - buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ]; + buildInputs = [ libX11 libGL libdrm meson ninja pkg-config wayland obs-studio ]; installPhase = '' mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 65f032c078c..7bacf4138c1 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, +{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, CoreFoundation }: @@ -14,7 +14,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which qmake wrapQtAppsHook diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index d769eaa5955..84f5ac56e7d 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen , alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor , zlib, AGL, Cocoa, Foundation }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig cmake doxygen ]; + [ pkg-config cmake doxygen ]; buildInputs = optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index e66c519f78b..2070d05d980 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, cmake, doxygen +, pkg-config, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 , unittest-cpp, cppzmq, zeromq @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ imagemagick ffmpeg_3 swig python3 unittest-cpp diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 64f7b7181ee..35dceddf224 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: +{ lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index d81c32de20c..2a1418cb373 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -6,7 +6,7 @@ , gettext , desktop-file-utils , appstream-glib -, pkgconfig +, pkg-config , txt2man , gzip , vala @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 - pkgconfig + pkg-config txt2man python3 vala diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 5f7f62a409b..e690c507024 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3, mkDerivation +{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let @@ -21,7 +21,7 @@ in mkDerivation rec { sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; }; - nativeBuildInputs = [ pkgconfig cmake python3 ]; + nativeBuildInputs = [ pkg-config cmake python3 ]; buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras libvdpau SDL2 mpv libGL ]; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 0de021a82a1..b05fa113a30 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: mkDerivation rec { pname = "QMediathekView"; @@ -18,7 +18,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools xz boost ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index b37d65d8ffc..53b46ceeb07 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -12,7 +12,7 @@ , ninja , libxml2 , gettext -, pkgconfig +, pkg-config , libgphoto2 , gphoto2 , v4l-utils @@ -46,7 +46,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake extra-cmake-modules ninja diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 37486dfa114..071e67a1721 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: +{ lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { pname = "libquvi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index d91ac4526d1..676d073900c 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig}: +{lib, stdenv, fetchurl, pkg-config}: stdenv.mkDerivation rec { pname = "quvi-scripts"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index e7a5153f710..6718fc1dc36 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: +{lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: stdenv.mkDerivation rec { pname = "quvi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 160a9957456..ade4b61931b 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,7 +8,7 @@ , gettext , mlt , jack1 -, pkgconfig +, pkg-config , qtbase , qtmultimedia , qtx11extras @@ -35,7 +35,7 @@ mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 frei0r diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b42e1412152..939ae7c4440 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras -, libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja +, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, qtbase, cmake, ninja }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig cmake ninja ]; + nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ alsaLib ffmpeg_3 libjack2 libX11 libXext libXfixes libGLU libGL libpulseaudio qtbase qtx11extras diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 67918ee9806..3dfd9d4b09b 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool file wrapGAppsHook diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 16aa2a3e6a5..eeb61624409 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkg-config , gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true @@ -28,7 +28,7 @@ nativeBuildInputs = [ perl ]; # plugins uses the same build environment as vdr - propagatedNativeBuildInputs = [ pkgconfig gettext ]; + propagatedNativeBuildInputs = [ pkg-config gettext ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 9c49f8ba6df..f6ad2152e6e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib -, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska +, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ protobuf libmicrodns ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ] + nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ] ++ optionals withQt5 [ wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index c0b6853cf32..06e91218cac 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, mkDerivation -, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr +, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: @@ -15,7 +15,7 @@ mkDerivation rec { sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ alsaLib libv4l diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index a0d25f2ec1e..ef485fc8201 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -22,7 +22,7 @@ mkDerivation rec { v4l-utils ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; qmakeFlags = [ "Webcamoid.pro" diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 747af7a3b02..f197abacee0 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig +, pkg-config , intltool , libX11, libXv, libSM , gtk, libglade @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = with lib; - [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; + [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index c11d77c2974..651597b3a48 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl +{lib, stdenv, fetchurl, pkg-config, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; }; - nativeBuildInputs = [ pkgconfig shared-mime-info ]; + nativeBuildInputs = [ pkg-config shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 06a433f4021..e0cca040987 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, pkgconfig, gtk2 +{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./xlib.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 58d7a3ad704..f2418d80d2e 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libtool +, pkg-config, libtool , gtk2, libGLU, libGL, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ]; buildInputs = - [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 59c97c4a8de..32d5be13d3b 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoPatches = [ ./cargo-lock-vendor-fix.patch ]; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 38ce277bf3f..3ad540e5307 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin -, pkgconfig, minijail, dtc, libusb1, libcap, linux +, pkg-config, minijail, dtc, libusb1, libcap, linux }: let @@ -55,7 +55,7 @@ in cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dtc libcap libusb1 minijail ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index ef506c01cfb..3f4bbedbc1b 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , go-md2man -, pkgconfig +, pkg-config , libcap , libseccomp , python3 @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook go-md2man pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ]; diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index e7cfb3c7a58..3ce493c6178 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , libelf , libcap , libseccomp @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - nativeBuildInputs = [ pkgconfig rpcsvc-proto makeWrapper ]; + nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ]; buildInputs = [ libelf libcap libseccomp libtirpc ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e7c8cc4d47a..720f684f44c 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp , libXi, libXext, wayland, libffi, libGLU, expat, libbfd }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a5c8d976932..1afe994977c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ce2797d35d0..bf6f2769e7e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsaLib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9"; }; - nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ] + nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison ] ++ optionals gtkSupport [ wrapGAppsHook ]; buildInputs = [ zlib glib perl pixman diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 547b177b3a6..00dffc385a1 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: mkDerivation rec { pname = "qtemu"; @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 998a127b2fc..48b0423983d 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, +{lib, stdenv, fetchurl, pkg-config, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 1d2a32c54e3..1633c8d66f3 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config , qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol , libselinux, libsepol, util-linux @@ -35,7 +35,7 @@ mkDerivation rec { libselinux libsepol util-linux ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; meta = with lib; { homepage = "https://f1ash.github.io/qt-virt-manager"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index c31552db301..4fd56e0cae3 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook , glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; }; - nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; + nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ]; buildInputs = [ glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte ] ++ optionals spiceSupport [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index eb7d067b6d5..be9598293cc 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras -, qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). @@ -45,7 +45,7 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ] + nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 692fdbf96cb..313cfa208d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24034,7 +24034,7 @@ in opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; orca-c = callPackage ../applications/audio/orca-c {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 754e0d75310..cd9dce6bbb3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4872,7 +4872,7 @@ in { poetry-core = callPackage ../development/python-modules/poetry-core { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkg-config; }; polib = callPackage ../development/python-modules/polib { }; From d13840759c7497cca2bb7f890ed66932a1f9c857 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 09:14:13 +0700 Subject: [PATCH 28/38] pkgs/data: pkgconfig -> pkg-config --- pkgs/data/documentation/zeal/default.nix | 4 ++-- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 4 ++-- pkgs/data/icons/gnome-icon-theme/default.nix | 4 ++-- pkgs/data/icons/tango-icon-theme/default.nix | 4 ++-- pkgs/data/misc/adapta-backgrounds/default.nix | 4 ++-- pkgs/data/misc/media-player-info/default.nix | 4 ++-- pkgs/data/misc/shared-mime-info/default.nix | 4 ++-- pkgs/data/misc/xorg-rgb/default.nix | 4 ++-- pkgs/data/themes/adapta/default.nix | 4 ++-- pkgs/data/themes/greybird/default.nix | 4 ++-- pkgs/data/themes/plata/default.nix | 4 ++-- pkgs/data/themes/qtcurve/default.nix | 4 ++-- pkgs/data/themes/solarc/default.nix | 4 ++-- pkgs/data/themes/vertex/default.nix | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7543672f7d0..a6c0b1f4918 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: @@ -22,7 +22,7 @@ mkDerivation rec { -e 's@^project.*@project(Zeal VERSION ${version})@' ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ qtbase qtimageformats qtwebengine qtx11extras diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 59d1ed353f3..d93e5885401 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -7,7 +7,7 @@ , optipng , cairo , python3 -, pkgconfig +, pkg-config , pngquant , which , imagemagick @@ -131,7 +131,7 @@ in zopfli pngquant which - pkgconfig + pkg-config emojiPythonEnv ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index adf2139d0ce..bd4e43ff5ed 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gdk-pixbuf librsvg optipng diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index b9a4fd48fb6..0e6a2fc67c4 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation rec { pname = "gnome-icon-theme"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool iconnamingutils gtk2 diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index b69bf4d46f5..09d0875ca8a 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg +{ lib, stdenv, fetchurl, intltool, pkg-config, iconnamingutils, imagemagick, librsvg , gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; # still missing parent icon themes: cristalsvg diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 029961f6c52..6debaa9ebe2 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib }: stdenv.mkDerivation rec { pname = "adapta-backgrounds"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ meson ninja pkgconfig glib ]; + nativeBuildInputs = [ meson ninja pkg-config glib ]; meta = with lib; { description = "Wallpaper collection for adapta-project"; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 867822af39e..56e4ace41f4 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, udev, systemd }: +{ lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }: let name = "media-player-info-24"; @@ -13,7 +13,7 @@ in }; buildInputs = [ udev systemd ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; postPatch = '' patchShebangs ./tools diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 69e1e697a47..c69a9802c0c 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , perlPackages , itstool @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool ] ++ (with perlPackages; [ diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index c74c4b826ed..24689d571da 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, xorgproto}: +{lib, stdenv, fetchurl, pkg-config, xorgproto}: stdenv.mkDerivation rec { pname = "rgb"; version = "1.0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkg-config]; buildInputs = [xorgproto]; meta = { inherit version; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index 7bbb8b6acc9..f67d689a4bf 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config parallel sassc inkscape diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 987df8deaf4..202424eeb2c 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "greybird"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config sassc ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 5c7de90b295..69e6f0bb0d2 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel , sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config parallel sassc inkscape diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index a65a24dc0b6..45a56f3355e 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config, mkDerivation , gtk2Support ? true, gtk2 , qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration @@ -30,7 +30,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ qtbase qtsvg qtx11extras diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index 62a9b1076cf..3f6932e40a0 100644 --- a/pkgs/data/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk-engine-murrine, gtk3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; }; - nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; + nativeBuildInputs = [ autoconf automake pkg-config gtk3 ]; propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix index 7e0b5d7e9cb..d25df29013b 100644 --- a/pkgs/data/themes/vertex/default.nix +++ b/pkgs/data/themes/vertex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-vertex"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 82ba45d59ea531f06e8849c284618067d2822d3a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 09:15:29 +0700 Subject: [PATCH 29/38] pkgs/shells: pkgconfig -> pkg-config --- pkgs/shells/dgsh/default.nix | 4 ++-- pkgs/shells/jush/default.nix | 4 ++-- pkgs/shells/mrsh/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index 28e5b15b3e7..7a6ae67c3ae 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool, check, bison, git, gperf, perl, texinfo, help2man, gettext, ncurses }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./glibc-2.26.patch ]; - nativeBuildInputs = [ autoconf automake pkgconfig libtool check + nativeBuildInputs = [ autoconf automake pkg-config libtool check bison git gettext gperf perl texinfo help2man ncurses ]; diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index f6d07814ce1..12cd6c935c0 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, editline }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, editline }: stdenv.mkDerivation rec { pname = "jush"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ editline ]; diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index c457b72953b..8efebb8f321 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, readline }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, readline }: stdenv.mkDerivation rec { pname = "mrsh"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ readline ]; doCheck = true; From 5fffcef915761939a2d78e679e43551dc1adf09e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 09:21:50 +0700 Subject: [PATCH 30/38] pkgs/desktops: pkgconfig -> pkg-config --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 4 ++-- pkgs/desktops/cinnamon/cjs/default.nix | 4 ++-- pkgs/desktops/cinnamon/muffin/default.nix | 4 ++-- pkgs/desktops/cinnamon/nemo/default.nix | 4 ++-- pkgs/desktops/cinnamon/xapps/default.nix | 4 ++-- pkgs/desktops/enlightenment/econnman/default.nix | 4 ++-- pkgs/desktops/enlightenment/ephoto/default.nix | 4 ++-- pkgs/desktops/enlightenment/rage/default.nix | 4 ++-- .../gnome-2/bindings/gnome-python-desktop/default.nix | 4 ++-- pkgs/desktops/gnome-2/bindings/gnome-python/default.nix | 4 ++-- pkgs/desktops/gnome-2/bindings/libglademm/default.nix | 4 ++-- pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 4 ++-- pkgs/desktops/gnome-2/desktop/mail-notification/default.nix | 4 ++-- pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix | 4 ++-- pkgs/desktops/gnome-2/desktop/vte/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/GConf/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 4 ++-- pkgs/desktops/gnome-2/platform/gtkhtml/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libIDL/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libbonobo/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libbonoboui/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libglade/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomecups/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/cheese/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/ghex/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-books/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-todo/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-weather/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/vinagre/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/baobab/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/caribou/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/empathy/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++-- .../desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-session/default.nix | 4 ++-- .../desktops/gnome-3/core/gnome-settings-daemon/default.nix | 4 ++-- .../gnome-3/core/gnome-shell-extensions/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-user-share/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/mutter/3.34/default.nix | 6 +++--- pkgs/desktops/gnome-3/core/mutter/default.nix | 6 +++--- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/rygel/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/sushi/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/totem/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/zenity/default.nix | 4 ++-- pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 4 ++-- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/atomix/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/five-or-more/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-mines/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-robots/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/hitori/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/lightsoff/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/quadrapassel/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/swell-foop/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/tali/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/geary/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gitg/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 4 ++-- .../gnome-3/misc/libgnome-games-support/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/metacity/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/nautilus-python/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 4 ++-- pkgs/desktops/gnustep/back/default.nix | 4 ++-- pkgs/desktops/gnustep/base/default.nix | 4 ++-- pkgs/desktops/lxde/core/lxpanel/default.nix | 4 ++-- pkgs/desktops/lxde/core/lxrandr/default.nix | 4 ++-- pkgs/desktops/lxde/core/lxtask/default.nix | 4 ++-- pkgs/desktops/lxqt/compton-conf/default.nix | 4 ++-- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- pkgs/desktops/lxqt/obconf-qt/default.nix | 4 ++-- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- pkgs/desktops/mate/atril/default.nix | 4 ++-- pkgs/desktops/mate/caja-dropbox/default.nix | 4 ++-- pkgs/desktops/mate/caja-extensions/default.nix | 4 ++-- pkgs/desktops/mate/caja/default.nix | 4 ++-- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- pkgs/desktops/mate/eom/default.nix | 4 ++-- pkgs/desktops/mate/libmatekbd/default.nix | 4 ++-- pkgs/desktops/mate/libmatemixer/default.nix | 4 ++-- pkgs/desktops/mate/libmateweather/default.nix | 4 ++-- pkgs/desktops/mate/marco/default.nix | 4 ++-- pkgs/desktops/mate/mate-applets/default.nix | 4 ++-- pkgs/desktops/mate/mate-calc/default.nix | 4 ++-- pkgs/desktops/mate/mate-control-center/default.nix | 4 ++-- pkgs/desktops/mate/mate-desktop/default.nix | 4 ++-- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++-- pkgs/desktops/mate/mate-indicator-applet/default.nix | 4 ++-- pkgs/desktops/mate/mate-media/default.nix | 4 ++-- pkgs/desktops/mate/mate-menus/default.nix | 4 ++-- pkgs/desktops/mate/mate-netbook/default.nix | 4 ++-- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- pkgs/desktops/mate/mate-panel/default.nix | 4 ++-- pkgs/desktops/mate/mate-polkit/default.nix | 4 ++-- pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++-- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 ++-- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++-- pkgs/desktops/mate/mate-terminal/default.nix | 4 ++-- pkgs/desktops/mate/mate-themes/default.nix | 4 ++-- pkgs/desktops/mate/mate-user-share/default.nix | 4 ++-- pkgs/desktops/mate/mate-utils/default.nix | 4 ++-- pkgs/desktops/mate/mozo/default.nix | 4 ++-- pkgs/desktops/mate/pluma/default.nix | 4 ++-- pkgs/desktops/mate/python-caja/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/appcenter/default.nix | 6 +++--- .../pantheon/apps/elementary-calculator/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-calendar/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-feedback/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-music/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 4 ++-- .../pantheon/apps/elementary-screenshot-tool/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/sideload/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/a11y/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++-- .../apps/switchboard-plugs/applications/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 4 ++-- .../apps/switchboard-plugs/mouse-touchpad/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/network/default.nix | 4 ++-- .../apps/switchboard-plugs/notifications/default.nix | 4 ++-- .../apps/switchboard-plugs/onlineaccounts/default.nix | 4 ++-- .../apps/switchboard-plugs/pantheon-shell/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/power/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/printers/default.nix | 4 ++-- .../apps/switchboard-plugs/security-privacy/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/sharing/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/sound/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/switchboard/default.nix | 4 ++-- .../pantheon/artwork/elementary-sound-theme/default.nix | 4 ++-- .../desktop/elementary-default-settings/default.nix | 4 ++-- .../pantheon/desktop/elementary-greeter/default.nix | 4 ++-- .../pantheon/desktop/elementary-onboarding/default.nix | 4 ++-- .../pantheon/desktop/elementary-print-shim/default.nix | 4 ++-- .../desktop/elementary-shortcut-overlay/default.nix | 4 ++-- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- .../wingpanel-indicators/applications-menu/default.nix | 4 ++-- .../desktop/wingpanel-indicators/bluetooth/default.nix | 4 ++-- .../desktop/wingpanel-indicators/datetime/default.nix | 4 ++-- .../desktop/wingpanel-indicators/keyboard/default.nix | 4 ++-- .../desktop/wingpanel-indicators/network/default.nix | 4 ++-- .../desktop/wingpanel-indicators/nightlight/default.nix | 4 ++-- .../desktop/wingpanel-indicators/notifications/default.nix | 4 ++-- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 4 ++-- .../desktop/wingpanel-indicators/session/default.nix | 4 ++-- .../pantheon/desktop/wingpanel-indicators/sound/default.nix | 4 ++-- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 ++-- pkgs/desktops/pantheon/granite/default.nix | 4 ++-- pkgs/desktops/pantheon/services/contractor/default.nix | 4 ++-- .../pantheon/services/elementary-capnet-assist/default.nix | 4 ++-- .../services/elementary-settings-daemon/default.nix | 4 ++-- .../pantheon/services/pantheon-agent-geoclue2/default.nix | 4 ++-- .../pantheon/services/pantheon-agent-polkit/default.nix | 4 ++-- pkgs/desktops/rox/rox-filer/default.nix | 4 ++-- pkgs/desktops/xfce/art/xfce4-icon-theme.nix | 4 ++-- pkgs/desktops/xfce/mkXfceDerivation.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix | 4 ++-- .../desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix | 4 ++-- .../xfce4-vala-panel-appmenu-plugin/default.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix | 4 ++-- pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix | 4 ++-- pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix | 4 ++-- 268 files changed, 539 insertions(+), 539 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 5886804392b..11fcdb7452b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -22,7 +22,7 @@ , libXtst , muffin , networkmanager -, pkgconfig +, pkg-config , polkit , lib, stdenv , wrapGAppsHook @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { libXtst muffin networkmanager - pkgconfig + pkg-config polkit libxml2 libgnomekbd diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix index c7b912f8281..d1ec77b7050 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glib, gnome3 }: stdenv.mkDerivation rec { pname = "libcroco"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 glib ]; passthru = { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 6a495ccc516..198cfe40a6d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , glib , gettext @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook wrapGAppsHook gettext diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index f9b204d6114..cdcabb1261f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -5,7 +5,7 @@ , intltool , meson , ninja -, pkgconfig +, pkg-config , pulseaudio , python3 , lib, stdenv @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook intltool - pkgconfig + pkg-config ]; postPatch = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index cdcbe6ec805..a1771506477 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , meson , ninja -, pkgconfig +, pkg-config , lib, stdenv , wrapGAppsHook }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja wrapGAppsHook - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 029dea37de1..8c213a2854c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , meson , ninja , glib @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook gettext intltool diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 303523420c7..3d63846026a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -12,7 +12,7 @@ , makeWrapper , meson , ninja -, pkgconfig +, pkg-config , python3 , lib, stdenv , systemd @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_412 python3 - pkgconfig + pkg-config libxslt xmlto ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 4e930741b99..c5bae4e5767 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -13,7 +13,7 @@ , libnotify , libxklavier , wrapGAppsHook -, pkgconfig +, pkg-config , pulseaudio , lib, stdenv , systemd @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { autoreconfHook wrapGAppsHook intltool - pkgconfig + pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 90989d45e42..184c1438196 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -1,7 +1,7 @@ { dbus-glib , fetchFromGitHub , gobject-introspection -, pkgconfig +, pkg-config , lib, stdenv , wrapGAppsHook , python3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson # ADDING cmake breaks the build, ignore meson warning ninja - pkgconfig + pkg-config makeWrapper which # for locale detection libxml2 # for xml-stripblanks diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index be6f69359cc..93079e21d3d 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -13,7 +13,7 @@ , libstartup_notification , libXtst , libxkbcommon -, pkgconfig +, pkg-config , lib, stdenv , udev , xorg @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gettext libtool wrapGAppsHook - pkgconfig + pkg-config intltool gnome-doc-utils diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index aa876a305c6..5017c1ce7d5 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -4,7 +4,7 @@ , gobject-introspection , meson , ninja -, pkgconfig +, pkg-config , lib, stdenv , wrapGAppsHook , libxml2 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson - pkgconfig + pkg-config ninja wrapGAppsHook intltool diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 0e8c7defa72..f9429a071cc 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -9,7 +9,7 @@ , xorg , meson , ninja -, pkgconfig +, pkg-config , python3 , lib, stdenv , vala @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/enlightenment/econnman/default.nix b/pkgs/desktops/enlightenment/econnman/default.nix index 265c66d0d82..a781aa230b6 100644 --- a/pkgs/desktops/enlightenment/econnman/default.nix +++ b/pkgs/desktops/enlightenment/econnman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: +{ lib, stdenv, fetchurl, pkg-config, efl, python3Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { pname = "econnman"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - nativeBuildInputs = [ makeWrapper pkgconfig python3Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper pkg-config python3Packages.wrapPython ]; buildInputs = [ efl python3Packages.python dbus ]; diff --git a/pkgs/desktops/enlightenment/ephoto/default.nix b/pkgs/desktops/enlightenment/ephoto/default.nix index 952fc41d1ba..2da7df3728d 100644 --- a/pkgs/desktops/enlightenment/ephoto/default.nix +++ b/pkgs/desktops/enlightenment/ephoto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: +{ lib, stdenv, fetchurl, pkg-config, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { pname = "ephoto"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config mesa.dev # otherwise pkg-config does not find gbm makeWrapper ]; diff --git a/pkgs/desktops/enlightenment/rage/default.nix b/pkgs/desktops/enlightenment/rage/default.nix index c35a75b0932..ac3eb796388 100644 --- a/pkgs/desktops/enlightenment/rage/default.nix +++ b/pkgs/desktops/enlightenment/rage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "rage"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config mesa.dev wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index ef4c2ba0d91..86d92adbea8 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }: +{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkg-config, python2, gtk2 }: let inherit (python2.pkgs) python pygtk; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 librsvg libwnck libgtop python ]; propagatedBuildInputs = [ gnome_python pygtk ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 01b7149291b..1e7d726d557 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }: +{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }: with lib; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ]; propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index 177a9f47c31..b997a9ddd1a 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }: +{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }: stdenv.mkDerivation rec { name = "libglademm-2.6.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool ]; propagatedBuildInputs = [ gtkmm2 libglade ]; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 741e2efe345..34dfaa85b2f 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib +{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib , gnome-common, gtk2, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ atk cairo glib gtk2 pango libxml2Python perl intltool diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 6cfc2891ee4..1e0064a8fad 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index e5892c0659f..258789140c8 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}: +{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}: stdenv.mkDerivation { name = "scrollkeeper-0.3.14"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . "; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt gettext ] ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 1b8071144a3..6ce8df2daf4 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses +{ lib, stdenv, fetchurl, fetchpatch, intltool, pkg-config, glib, gtk2, ncurses , pythonSupport ? false, python27Packages}: let @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib gtk2 ncurses ] ++ lib.optionals pythonSupport [python pygtk]; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index bf4bd9fb68d..ec8deb537d0 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: stdenv.mkDerivation rec { pname = "gconf"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib dbus-glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 48198bbdc9d..ab76e0c64fd 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - nativeBuildInputs = [ pkgconfig libintl ]; + nativeBuildInputs = [ pkg-config libintl ]; propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 7196840978f..4196cf21c27 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia gnome_mime_data avahi acl diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 780acebbb37..ed0971b7131 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , gtk-doc , autoconf , automake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gtk-doc autoconf automake diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index f4d6cb534bc..d8e1ea7108e 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool +{ stdenv, fetchurl, pkg-config, gtk3, intltool , GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 57a000351cf..ec87bafc998 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, +{ stdenv, fetchurl, pkg-config, gtk2, intltool, GConf, enchant, isocodes, gnome-icon-theme }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html patches = [ ./01_remove-disable-deprecated.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; NIX_LDFLAGS = "-lgthread-2.0"; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 1fc78002606..4e9376d5c82 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}: +{stdenv, fetchurl, flex, bison, pkg-config, glib, gettext}: stdenv.mkDerivation rec { name = "libIDL-${minVer}.14"; @@ -11,5 +11,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib gettext ]; - nativeBuildInputs = [ flex bison pkgconfig ]; + nativeBuildInputs = [ flex bison pkg-config ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index bf0cec8dfbe..8d991d743be 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = # still using stuff deprecated in new glib versions "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; - nativeBuildInputs = [ flex bison pkgconfig intltool procps ]; + nativeBuildInputs = [ flex bison pkg-config intltool procps ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 0be9d7acb9c..4f9176acf10 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk2, libtool +{ stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index befa237dfd5..3eb7b533f09 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: assert withLibgladeConvert -> python2 != null; @@ -12,7 +12,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext ] ++ lib.optional withLibgladeConvert python2; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 42f47bc5a83..ee477cb63c1 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 +{ stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, libtool, libogg }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 72928d82037..eb40c5ec0b5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, libart_lgpl, libglade }: +{ stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: stdenv.mkDerivation rec { name = "libgnomecanvas-${minVer}.3"; @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ libglade ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; propagatedBuildInputs = [ libart_lgpl gtk2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index b3ac327f8c3..2811a138cb6 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }: +{ stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: stdenv.mkDerivation { name = "libgnomecanvasmm-2.26.0"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgnomecanvas gtkmm2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index ee0282147de..7e33ee91285 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl }: +{ stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: stdenv.mkDerivation rec { name = "libgnomecups-0.2.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./glib.patch ./cups_1.6.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext intltool libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index dd1975ac20f..b67be2b7f5b 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl , libgnomecups, bison, flex }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index e535fe832d5..80d2c2050af 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: +{stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: stdenv.mkDerivation { name = "libgnomeprintui-2.18.6"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 20cc3877efb..0fa3847d9bd 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango +{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome-keyring, libglade }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index 0d362a28519..e7cf117ecdb 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }: +{stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: stdenv.mkDerivation { name = "libgtkhtml-2.11.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 gettext ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 0620d699ac8..550f3f31d0b 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gnome3 , gtk3 , wrapGAppsHook @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # For setup hook itstool libxml2 - pkgconfig + pkg-config dbus wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 986bd43331f..04c6b31563c 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -4,7 +4,7 @@ , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 -, pkgconfig +, pkg-config , gtk3 , glib , clutter-gtk @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 45c8015ce24..4bede93ebb7 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -6,7 +6,7 @@ , libxml2 , webkitgtk , highlight -, pkgconfig +, pkg-config , gtk3 , glib , libnotify @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { itstool libxml2 ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index fead1c7bcff..81680fb5df8 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; # postinstall.py - nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; + nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 38d059cc84d..79d31c3b8c7 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -2,7 +2,7 @@ , meson , fetchurl , python3 -, pkgconfig +, pkg-config , gtk3 , glib , adwaita-icon-theme @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja perl - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index d832d1e809b..fb8cf0a1a1c 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 1b9cf9ce4ab..bff7c5fb281 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -5,7 +5,7 @@ , fetchurl , evince , gjs -, pkgconfig +, pkg-config , gtk3 , glib , tracker @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext libxslt desktop-file-utils diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 3fa9bc23ea1..302fb7f8127 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -3,7 +3,7 @@ , meson , ninja , wrapGAppsHook -, pkgconfig +, pkg-config , gettext , itstool , libvirt-glib @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 9f66f9b78ba..e15125a00bf 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , libdazzle , libgweather @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext libxml2 wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index c435bc49c23..3a65be9440e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , gnome3 , glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index bd90b5914aa..a2caaf068eb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, pkgconfig +, pkg-config , wrapGAppsHook , itstool , desktop-file-utils @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { vala meson ninja - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 84ca0ab5997..3172ae27123 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -6,7 +6,7 @@ , fetchpatch , evince , gjs -, pkgconfig +, pkg-config , gtk3 , glib , tracker @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool libxslt diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index eae4cbdbda8..20b27b2ddd0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gnome3 , glib , gtk3 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { python3 meson ninja - pkgconfig + pkg-config wrapGAppsHook gettext itstool diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 752fb4d820e..fa2fb86a5ce 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -4,7 +4,7 @@ , ninja , gettext , python3 -, pkgconfig +, pkg-config , gnome3 , gtk3 , gobject-introspection @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 6cedbcaf4d6..fc0ee5d38ff 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -14,7 +14,7 @@ , gnome-online-accounts , grilo , grilo-plugins -, pkgconfig +, pkg-config , gtk3 , pango , glib @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { ninja gettext itstool - pkgconfig + pkg-config libxml2 wrapGAppsHook desktop-file-utils diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 60a70ac63ea..6fca1c0eea5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 gnome3.adwaita-icon-theme diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 3f093b0e8da..c6d4a30ab0a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -3,7 +3,7 @@ , ninja , gettext , fetchurl -, pkgconfig +, pkg-config , wrapGAppsHook , itstool , desktop-file-utils @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool libxml2 diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 036aa84c094..cb79a772b79 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , gettext , fetchurl -, pkgconfig +, pkg-config , gtk3 , glib , meson @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config wrapGAppsHook gettext diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 6662e9f4e7e..f5ca1ba0ea6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , gobject-introspection , wrapGAppsHook @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 867eca4cd9e..34aed52fa85 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , python3 , wrapGAppsHook , gettext @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext python3 wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 3d720478f2a..9a5079dfc64 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; }; - nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook python3 ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index b7206ca0ae6..727a82e5ff3 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkgconfig, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib +, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ - meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 + meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 desktop-file-utils gobject-introspection appstream-glib ]; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 25db5181cc4..f0972f8d6f1 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -5,7 +5,7 @@ , meson , ninja , libpwquality -, pkgconfig +, pkg-config , gtk3 , glib , wrapGAppsHook @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala itstool wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index aaf9aae23e7..49abb2f1a70 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index a71aca79357..a1be29b0183 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 15ae93075a4..81faf79cbb6 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, gettext, fetchurl, vala, desktop-file-utils -, meson, ninja, pkgconfig, python3, gtk3, glib, libxml2 +, meson, ninja, pkg-config, python3, gtk3, glib, libxml2 , wrapGAppsHook, itstool, gnome3 }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index 5c741614c39..88260f05acf 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 8de140e33ca..4e7892c048f 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf +{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja vala libxslt pkgconfig wrapGAppsHook + meson ninja vala libxslt pkg-config wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 0e4e349dbdb..8ebb5c3f64f 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -2,7 +2,7 @@ , intltool , fetchurl , webkitgtk -, pkgconfig +, pkg-config , gtk3 , glib , file @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config libtool intltool itstool diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 9515d28520c..9f949b60738 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -3,7 +3,7 @@ , ninja , gettext , fetchurl -, pkgconfig +, pkg-config , gtk3 , glib , icu @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook buildPackages.glib diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 998f4dfd9a2..77b8b8977d1 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , libxml2 , appstream @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook yelp-tools diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index a48676cc983..def25f62f3c 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala + cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; buildInputs = [ glib libsoup libxml2 gtk3 gnome-online-accounts diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 70c206bccf9..36bf7b3e92c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; meta = with lib; { platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 2bba316ee12..2397b9d7be9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib +{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobject-introspection + meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 python3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index dffeb8896f8..e033197b347 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 +{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gettext itstool wrapGAppsHook python3 + meson ninja pkg-config vala gettext itstool wrapGAppsHook python3 gobject-introspection # for finding vapi files ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 69d8af9a09b..73db99f3d37 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , itstool , desktop-file-utils @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9c1d4760456..3a7e21c65f5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -3,7 +3,7 @@ , fetchurl , evolution-data-server , fetchpatch -, pkgconfig +, pkg-config , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext libxslt diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index e3628cbe2c4..5a78f412dc7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -52,7 +52,7 @@ , networkmanagerapplet , libnma , ninja -, pkgconfig +, pkg-config , polkit , python3 , samba @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 shared-mime-info wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 69287c9eae0..bfe0bfe9d61 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib +{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection + pkg-config meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 8615989b963..bb602c8b3fa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk3, glib, gsettings-desktop-schemas }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 700489e4dd3..95dfd0ef282 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2, gsettings-desktop-schemas , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxslt docbook_xsl + meson ninja pkg-config gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 092cdbbdce0..83563c7d212 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; # Do not run meson-postinstall.sh diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 98675f05bb5..002ae9197b7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -4,7 +4,7 @@ , gettext , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , gnome3 , accountsservice @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config systemd wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index e3189c27f70..cea15820557 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt +{ lib, stdenv, fetchurl, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_43, gnome3 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook + pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook ]; configureFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 5d9ff69a6fa..8411b2edecb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -3,7 +3,7 @@ , cairo , meson , ninja -, pkgconfig +, pkg-config , python3 , wrapGAppsHook , glib @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 4988a2d447b..432f7d9e2ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3 +{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils , gnome3, gsettings-desktop-schemas }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme gsettings-desktop-schemas diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index bb4a7fd68ef..d2dca54b5ca 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext makeWrapper + meson ninja pkg-config gettext makeWrapper xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 dbus # for DTD ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 9955eee2b3e..e5923e6b56a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -4,7 +4,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , perl , gettext @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config perl gettext libxml2 diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 3f3b619cfe6..8b882df3b00 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib +{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 checkInputs = [ spidermonkey_68 ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; + nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; mesonFlags = [ "-Dextension_set=all" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index c0cf9bceb67..215e95d9ad2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree +{ lib, stdenv, fetchurl, substituteAll, pkg-config, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 + meson ninja pkg-config gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 963dbad6290..db978f953b7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2 +{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - pkgconfig gettext itstool wrapGAppsHook meson ninja python3 + pkg-config gettext itstool wrapGAppsHook meson ninja python3 ]; buildInputs = [ bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 54e2bd698d1..b4e8db77510 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 , libxslt, docbook-xsl-nons }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gettext itstool which libxml2 libxslt docbook-xsl-nons + pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons vala desktop-file-utils wrapGAppsHook pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 4c9ed85fe48..7b42d724593 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6496df08945..54fcf531c65 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -6,7 +6,7 @@ , fetchpatch , apacheHttpd , nautilus -, pkgconfig +, pkg-config , gtk3 , glib , libxml2 @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index bbb271004ac..aac5a43e433 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , adwaita-icon-theme @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook unzip diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index d4baaef819f..65d2bbc2157 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: let pname = "libgnome-keyring"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 427893d2aab..1f4ca5d3213 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -2,7 +2,7 @@ , fetchpatch , substituteAll , lib, stdenv -, pkgconfig +, pkg-config , gnome3 , pantheon , gettext @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter + # required for pkg-config to detect mutter-clutter json-glib libXtst libcap_ng @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook xorgserver # for cvt command diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index bc86e965547..1ac0be1b194 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -3,7 +3,7 @@ , substituteAll , runCommand , lib, stdenv -, pkgconfig +, pkg-config , gnome3 , gettext , gobject-introspection @@ -74,7 +74,7 @@ let self = stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter + # required for pkg-config to detect mutter-clutter json-glib libXtst libcap_ng @@ -86,7 +86,7 @@ let self = stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook xorgserver # for cvt command diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 25b38a5df9f..5ca1efe1ca3 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , libxml2 , desktop-file-utils @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 234d45f877a..65096c359d7 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , vala , gettext , libxml2 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext libxml2 diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 96a8145ae7f..6d282283925 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , itstool , python3 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja gettext itstool - pkgconfig + pkg-config python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 70cb81a165b..f5e85a1f16c 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , meson , gettext , gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 082732eace6..a98265ff508 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -8,7 +8,7 @@ , clutter-gst , python3Packages , shared-mime-info -, pkgconfig +, pkg-config , gtk3 , glib , gobject-introspection @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config gettext python3Packages.python itstool diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7aa64d0357a..b02c7039e51 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , gettext , fetchurl -, pkgconfig +, pkg-config , itstool , libxml2 , libxslt @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool libxml2 diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 8b27f637280..62c5994fd41 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib +{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib , gnome3, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl"; }; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index b27c10447f4..d02cb581cb8 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxml2 , gnome3 , gtk3 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext yelp-tools itstool diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index d6109651ce9..4802287cb12 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig intltool itstool python3 makeWrapper + pkg-config intltool itstool python3 makeWrapper # Required by python3 ncurses ]; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 68d7d9adfd5..173e4a9e5b8 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , gtk3 , wrapGAppsHook @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 32bdbf7cb48..802d92bf19a 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 , gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 5c81524f973..9f6ea6aac04 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook + meson ninja pkg-config gettext itstool libxml2 python3 wrapGAppsHook vala ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index a324bb9cd46..17dc8fe7c2c 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook gettext meson itstool vala + pkg-config wrapGAppsHook gettext meson itstool vala ninja python3 desktop-file-utils ]; buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index db15ce18be8..918adc0eccf 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobject-introspection +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, wrapGAppsHook, gobject-introspection , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; }; - nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index e0ed167750d..fe1f092fbf0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig vala meson ninja python3 wrapGAppsHook + pkg-config vala meson ninja python3 wrapGAppsHook gettext itstool libxml2 appstream-glib desktop-file-utils gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index e5d34668b44..d5d2de53e47 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gettext, itstool, libxml2 , meson, ninja, glib, vala, desktop-file-utils }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala desktop-file-utils - pkgconfig gnome3.adwaita-icon-theme + pkg-config gnome3.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook glib # for glib-compile-schemas ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index b78c9924d63..600b0d98468 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gobject-introspection for finding vapi files nativeBuildInputs = [ - meson ninja vala gobject-introspection pkgconfig gettext itstool python3 + meson ninja vala gobject-introspection pkg-config gettext itstool python3 libxml2 wrapGAppsHook desktop-file-utils ]; buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index f35ac14891f..501b894a1df 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 , libxml2, libgee, libgnome-games-support, meson, ninja , desktop-file-utils, hicolor-icon-theme}: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala python3 - pkgconfig wrapGAppsHook gettext itstool libxml2 + pkg-config wrapGAppsHook gettext itstool libxml2 desktop-file-utils hicolor-icon-theme ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 80a3eceb4f6..e9a079216b7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support , libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja python3 + pkg-config meson ninja python3 libxml2 wrapGAppsHook gettext itstool desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 4e73882bcdf..7c5fd8f1ac9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq"; }; - nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index d25dc4fc1b6..9b8c78d6e4a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , librsvg, gsound, gettext, itstool, libxml2 , meson, ninja, vala, python3, desktop-file-utils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook meson ninja python3 + pkg-config wrapGAppsHook meson ninja python3 gettext itstool libxml2 vala desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 3a3dca27d76..9ae73773799 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook , libxml2, gettext, itstool, meson, ninja, python3 , vala, desktop-file-utils }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme - pkgconfig gettext meson ninja python3 vala desktop-file-utils + pkg-config gettext meson ninja python3 vala desktop-file-utils ]; buildInputs = [ gtk3 diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 480fb2b1373..bb0bd257260 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , glib , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 874e9558bcf..6783147840c 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 + vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 7a57dc19cc5..de3d67b58bf 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf , librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 vala desktop-file-utils - pkgconfig gnome3.adwaita-icon-theme + pkg-config gnome3.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index db9dfd2dc93..33dd9de1b42 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils , clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: let @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index a31191dfa2d..36c76c358e9 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook , meson, ninja, python3, desktop-file-utils }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 desktop-file-utils - pkgconfig gnome3.adwaita-icon-theme + pkg-config gnome3.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index bbc2db93e51..3ca257db49b 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gtk3 , vala , enchant2 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 4809e30deb3..0f4f8e67737 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -3,7 +3,7 @@ , fetchpatch , vala , gettext -, pkgconfig +, pkg-config , gtk3 , glib , json-glib @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 2887b86c80a..db7a6ba0920 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gnome3 , gtk3 , glib @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index ba25dcfed4c..b65d27bb757 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -15,7 +15,7 @@ , libpulseaudio , libxkbfile , libxml2 -, pkgconfig +, pkg-config , polkit , gdm , systemd @@ -87,7 +87,7 @@ let autoreconfHook gettext libxml2 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index c2904a777f2..53be2df471b 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome3, packagekit, polkit , gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils + pkg-config meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ gtk3 packagekit systemd polkit ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index 7e34040bb72..b820f7750dc 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -15,7 +15,7 @@ , libsoup , libwnck3 , libxml2 -, pkgconfig +, pkg-config , polkit , systemd , wrapGAppsHook @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gettext itstool libxml2 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 504846e8d4b..440c70c861f 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -11,7 +11,7 @@ , mutter , ninja , pango -, pkgconfig +, pkg-config , vala , wrapGAppsHook }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index a7cb34896d2..cc054a983c6 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, intltool , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 29b88e4863a..01899d20b57 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gtk3 , libgee @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 05a05a017cf..d1b1aeec4c4 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -10,7 +10,7 @@ , libgtop , libstartup_notification , libxml2 -, pkgconfig +, pkg-config , substituteAll , wrapGAppsHook , zenity @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext libxml2 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index c7aaddf203a..4db81228a07 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , which , gtk-doc , docbook_xsl @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which gtk-doc docbook_xsl diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index dfaa7f844aa..ae52c41787b 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoconf-archive , appstream-glib -, pkgconfig +, pkg-config , wrapGAppsHook , libcanberra , gst_all_1 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection libxml2 - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index bf6441f6820..18986400c00 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -4,7 +4,7 @@ , base, gui , xlibsWrapper , freetype -, pkgconfig +, pkg-config , libXmu }: let @@ -16,7 +16,7 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; sha256 = "1ynd27zwga17mp2qlym90k2xsypdvz24w6gyy2rfvmv0gkvlgrjr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { description = "A generic backend for GNUstep"; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index deeca1d600f..8cc68b75569 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -8,7 +8,7 @@ , libxml2, libxslt, libiconv , libobjc, libgcrypt , icu -, pkgconfig, portaudio +, pkg-config, portaudio , libiberty }: let @@ -20,7 +20,7 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; sha256 = "10xjrv5d443wzll6lf9y65p6v9kvx7xxklhsm1j05y93vwgzl0w8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ aspell audiofile cups diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index a7306f3d2a7..8cb8d2f580c 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder +{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder , gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib , menu-cache, lxmenu-data, wirelesstools, curl , supportAlsa ? false, alsaLib @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; }; - nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; + nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; buildInputs = [ keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev menu-cache lxmenu-data m4 wirelesstools curl diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index c3ab5e7e40a..7de2886eeb4 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { name = "lxrandr-0.3.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional withGtk3 "--enable-gtk3"; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; meta = with lib; { diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index c61e53715d2..27066ba9952 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }: stdenv.mkDerivation rec { pname = "lxtask"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 libintl ]; diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 38dfd621848..0ffdc5199aa 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , lxqt @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index fb6b759db55..4bb3cd52d82 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , pcre , libexif @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 014898f5326..217a6fe7922 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 8c5c57045d9..3d2ce3c0f57 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , json-glib , libfm-qt @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index cd39096678f..249d1664884 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , qtbase , glib @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config setupHook ]; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index c50b258243e..407e45655ae 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qtx11extras @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index d333bae3d30..5da0ab2499e 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , alsaLib , kguiaddons , kwindowsystem @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 5b708d6c036..762e7ac0462 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index d99692847f6..41a673fc345 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -31,7 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index bb212cf15a7..4be5eab5d94 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 3b9891053ff..5772dfcf9e7 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , qtbase , qttools @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index dafb8947918..cd6d177b2ef 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt , libpulseaudio , pcre @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 9a6085da02c..a2378fafd55 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt , qtbase , qttools @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index cac2ef27d72..bc4f0f0de9f 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config autoPatchelfHook # fix libuploader.so and libextedit.so not found ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c8b0e7721a2..3f68da288c0 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gettext , gtk3 , glib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 8c407f336f5..92176493afc 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig, gobject-introspection, gdk-pixbuf +, pkg-config, gobject-introspection, gdk-pixbuf , gtk3, mate, python3, dropbox }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection gdk-pixbuf (python3.withPackages (ps: with ps; [ diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 433468f3366..64a036fd389 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 8b4d6765d7b..890d3d61548 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index e60bbd2972e..591cac7d886 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 98239badd7e..8b447f14d8b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "eom"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 30a79391cdc..1b66bb97efe 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ gtk3 libxklavier ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 218d314df5c..29d6127c3b3 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, gettext, glib +{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib ] ++ lib.optional alsaSupport alsaLib diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index c67fd54884f..0f5deb8f550 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ gtk3 libsoup tzdata ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 60efc6db045..3c16004010c 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 51389a489e4..bfa5a1a5d95 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-applets"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index ddf6948bd48..2805c86fe89 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-calc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 58ce83b902f..262ca75ac79 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 6e69a3afedd..9102ae3e8b5 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-desktop"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 07dadf2dcd8..530a7b66ff1 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; }; - nativeBuildInputs = [ pkgconfig gettext iconnamingutils ]; + nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; buildInputs = [ librsvg ]; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 096d5070ab7..a26b593101a 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 6f25d571374..f4d8bd73884 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-media"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libtool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 748b7b3c272..1333af0cdd9 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; }; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; buildInputs = [ glib python3 ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 2bb49754aca..3912ab47c8e 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 056ded4dc63..5e867085bb1 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libxml2 # for xmllint wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 6858031ffd8..1ada0171911 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { gobject-introspection gettext itstool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 4263115c880..67690161f55 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { pname = "mate-polkit"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection gettext - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 0d3bb40ee3e..e0c46076a65 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libtool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 216931aff85..fe309352346 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext libxml2 # provides xmllint wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6368aaec327..6fed2a65444 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index b44aea73008..08a119ad8d2 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, +{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook, fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext xtrans wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index f6aaaf73d0a..0a483269c5e 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 38cea3cda58..2d89cb2494b 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool wrapGAppsHook diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index be8f005ca38..48588cc6d6d 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 25a278ab8ef..3c0d9cf1b02 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3, +{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; }; - nativeBuildInputs = [ pkgconfig gettext gtk3 ]; + nativeBuildInputs = [ pkg-config gettext gtk3 ]; buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index d91e538059b..8aa9591003c 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-user-share"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool libxml2 diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 9b5c857c9df..c58a3d4bc64 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool inkscape diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 78d448f09fe..cee4261a77d 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, stdenv, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; }; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index d7da098b3fb..a879f2df5d1 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pluma"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext perl itstool diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 10971d72e07..2c59d78e86a 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { pname = "python-caja"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext python3Packages.wrapPython ]; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 11ba1182f25..1c86de61607 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -21,7 +21,7 @@ , ninja , packagekit , pantheon -, pkgconfig +, pkg-config , python3 , vala , polkit @@ -48,12 +48,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib - dbus # for pkgconfig + dbus # for pkg-config desktop-file-utils gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index c75ffa8acf3..6229d3c1a63 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 48c660aeccb..f9ab49a72b9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 0640265e6db..9a48d38ad8c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 787fe691f6d..7339038b080 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index c28ee297e33..db6633aa5bd 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -13,7 +13,7 @@ , libXi , pango , gettext -, pkgconfig +, pkg-config , libxml2 , bamf , gdk-pixbuf @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 # xmllint - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index abad7f42eb8..21aeb38530f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 635f77e09ed..99fd2a6555f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { glib-networking meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index b8306394f10..24eafcabdea 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 6bf526cf4fe..ca0b3951351 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , desktop-file-utils , gtk3 @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 1224b9b3120..048aa4ab129 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 456fee4472b..46f279dd795 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , pantheon -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 95a61a5649d..e5506093719 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index df483b9a796..c3ba1717801 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -13,7 +13,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , vala , libxml2 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 699aa56f4a7..06f097e81af 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index fad80f13196..adba2ec0801 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -6,7 +6,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 3c76dc9053c..66596fa2ff1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 3f35c6a46b9..dea3c0306a3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 036b21a08fc..2337ef24119 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -5,7 +5,7 @@ , meson , ninja , substituteAll -, pkgconfig +, pkg-config , vala , libgee , granite @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 4471ebaef23..055a4098963 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 8cb401e48de..06bdce19f45 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -6,7 +6,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index c1177c54b24..67eeee584a6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 5672c442269..fce9402e131 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , substituteAll , vala , libgee @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index a1ed6b1085c..8c750710aed 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 43a411a4d25..ef12cb38e1b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala_0_46 , libgee , granite @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala_0_46 ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 6a9b1f6494d..97668d35471 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkg-config, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, elementary-dock, switchboard, gettext, bamf, fetchpatch }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 71ce891043b..f0cf47cfdfe 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -5,7 +5,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , elementary-dpms-helper @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 6a9ade11736..06d8041339d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index c90d88161a9..6a18f6b6e23 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -5,7 +5,7 @@ , meson , python3 , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index ff8fd5909ba..6baaed293c9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -5,7 +5,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ead5305651b..10117dd8f95 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , libgee , granite @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index d842b4f361b..d0b56d7456a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index b4d7ce5b247..a89ea19079e 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 27888065715..982502f5161 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -6,7 +6,7 @@ , ninja , nixos-artwork , glib -, pkgconfig +, pkg-config , dbus , polkit , accountsservice @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { glib # polkit requires meson ninja - pkgconfig + pkg-config polkit python3 ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 27d82c345a9..e80e7d951cd 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -5,7 +5,7 @@ , substituteAll , elementary-greeter , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 6d900b2e03f..70da883392a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , vala @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index e80dc3644fb..7b821f883ce 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -4,7 +4,7 @@ , pantheon , meson , ninja -, pkgconfig +, pkg-config , vala , gtk3 }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index d3f3725ad83..314267d8612 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index fac9e62c207..c4467c53a2b 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 19c565ac9f9..230ae29ffa0 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -7,7 +7,7 @@ , meson , ninja , python3 -, pkgconfig +, pkg-config , vala , granite , libgee @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 4e6fd0e4f6c..03500abd623 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 2b5898db932..c4e070aeacb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 01c3ee9e275..4e2f9455073 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , substituteAll @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index eb69d6410eb..ab898084c08 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 04047180f30..4481c181f53 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 3028fa21da3..97ab0cb80ed 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , fetchpatch , meson , ninja @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index e1156f693e4..69a17b9dd30 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 84b204a17f7..a6c08b613bb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index ab51071bd75..25707f39e46 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 752b7daac20..8e314d3d84b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , wrapGAppsHook -, pkgconfig +, pkg-config , meson , ninja , vala @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 8d06464ef1c..defb6095a35 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -5,7 +5,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , libgee , pantheon , gtk3 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 650c7a9fe87..e15480c8cc8 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -5,7 +5,7 @@ , meson , python3 , ninja -, pkgconfig +, pkg-config , vala , glib , libgee @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dbus meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 97320ce0496..d9f224ce45d 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , python3 , ninja @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 268f6c4aaef..a37e43cd355 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -4,7 +4,7 @@ , fetchgit , meson , ninja -, pkgconfig +, pkg-config , gnome3 , perl , gettext @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config perl gettext libxml2 diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 29b24981c47..70b62e2b9a0 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index f3a49654938..61bbb6ef9a4 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , meson , ninja , vala @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index e8ffe0f9d92..ed00f37c687 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk, libSM, shared-mime-info }: let version = "2.11"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; NIX_LDFLAGS = "-ldl -lm"; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 304375f87e3..a2339d58568 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: let category = "art"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gtk3 ]; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index f17b506367c..5c47dc7f85d 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: { category , pname @@ -25,7 +25,7 @@ let template = rec { inherit pname version; - nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 571305b5f91..aed655eb2bd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index 6c75b44d77a..e64d6fbae51 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46 , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pythonPath = [ dockbarx ]; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index e12e499aad8..a731c9fcbb5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: let category = "panel-plugins"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index c136fa00301..8df173d3367 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index bce6eb18473..95f93148a91 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 747d604e917..59796ad55b1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index bc8d9ff3276..8afff65696d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2, +{ lib, stdenv, fetchurl, pkg-config, intltool, autoreconfHook, gnome2, gtkmm2, libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 878722975f5..df31ea3b9b5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, exo, gnutls, libgcrypt, xfce }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index b5aa6aebb59..37f64021c72 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, exo, xfce }: let @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index 92d39fc8fbb..407f349d9bf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, python3, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46 , gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; }; - nativeBuildInputs = [ pkgconfig vala_0_46 wafHook python3 ]; + nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ]; buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index e5864d82920..09ff309c05f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index ee1bff6733b..845f1b22e33 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 34d7b5deae7..a313510fded 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 9e093024d42..7c2fb69dc5c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index ce90dd6809d..d8946c98a38 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, +{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, xfce, libwnck3, libdbusmenu, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; }; - nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ]; + nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ]; buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index eba010009bf..18639946ce8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxml2, libsoup, upower, libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: let @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index f5cf3899b02..ec6ef0e7b62 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, gtk2 , exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 85a8b95dc00..b632fde2df2 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , gtk3 , thunar , cmake @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ninja ]; From fce00d15c2521710ac1043d6b5251803fb9a8808 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 09:30:45 +0700 Subject: [PATCH 31/38] pkgs/misc: pkgconfig -> pkg-config --- pkgs/misc/apulse/default.nix | 4 ++-- pkgs/misc/apulse/pressureaudio.nix | 4 ++-- pkgs/misc/barebox/default.nix | 4 ++-- pkgs/misc/cups/cups-pk-helper.nix | 4 ++-- pkgs/misc/cups/default.nix | 4 ++-- pkgs/misc/cups/filters.nix | 4 ++-- pkgs/misc/drivers/epkowa/default.nix | 4 ++-- pkgs/misc/drivers/foomatic-filters/default.nix | 4 ++-- pkgs/misc/drivers/gutenprint/default.nix | 4 ++-- pkgs/misc/drivers/hplip/3.16.11.nix | 4 ++-- pkgs/misc/drivers/hplip/3.18.5.nix | 4 ++-- pkgs/misc/drivers/hplip/default.nix | 4 ++-- pkgs/misc/drivers/xboxdrv/default.nix | 4 ++-- pkgs/misc/drivers/xwiimote/default.nix | 4 ++-- pkgs/misc/emulators/attract-mode/default.nix | 4 ++-- pkgs/misc/emulators/blastem/default.nix | 4 ++-- pkgs/misc/emulators/caprice32/default.nix | 4 ++-- pkgs/misc/emulators/cdemu/base.nix | 4 ++-- pkgs/misc/emulators/cdemu/libmirage.nix | 4 ++-- pkgs/misc/emulators/desmume/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/master.nix | 4 ++-- pkgs/misc/emulators/emulationstation/default.nix | 4 ++-- pkgs/misc/emulators/fceux/default.nix | 4 ++-- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- pkgs/misc/emulators/fuse-emulator/default.nix | 4 ++-- pkgs/misc/emulators/gens-gs/default.nix | 4 ++-- pkgs/misc/emulators/higan/default.nix | 4 ++-- pkgs/misc/emulators/mame/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- pkgs/misc/emulators/mednaffe/default.nix | 4 ++-- pkgs/misc/emulators/melonDS/default.nix | 4 ++-- pkgs/misc/emulators/mgba/default.nix | 4 ++-- pkgs/misc/emulators/mupen64plus/default.nix | 4 ++-- pkgs/misc/emulators/nestopia/default.nix | 4 ++-- pkgs/misc/emulators/openmsx/default.nix | 4 ++-- pkgs/misc/emulators/pcsx2/default.nix | 4 ++-- pkgs/misc/emulators/pcsxr/default.nix | 4 ++-- pkgs/misc/emulators/ppsspp/default.nix | 4 ++-- pkgs/misc/emulators/qmc2/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/cores.nix | 12 ++++++------ pkgs/misc/emulators/retroarch/default.nix | 4 ++-- pkgs/misc/emulators/retrofe/default.nix | 4 ++-- pkgs/misc/emulators/rpcs3/default.nix | 4 ++-- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 ++-- pkgs/misc/emulators/tilem/default.nix | 12 ++++++------ pkgs/misc/emulators/uae/default.nix | 4 ++-- pkgs/misc/emulators/vbam/default.nix | 4 ++-- pkgs/misc/emulators/vice/default.nix | 4 ++-- pkgs/misc/emulators/xcpc/default.nix | 4 ++-- pkgs/misc/emulators/yabause/default.nix | 4 ++-- pkgs/misc/emulators/yuzu/default.nix | 4 ++-- pkgs/misc/gnash/default.nix | 4 ++-- pkgs/misc/hdt/default.nix | 4 ++-- pkgs/misc/jackaudio/default.nix | 4 ++-- pkgs/misc/jackaudio/jack1.nix | 4 ++-- pkgs/misc/libcardiacarrest/default.nix | 4 ++-- pkgs/misc/lightspark/default.nix | 4 ++-- pkgs/misc/lilypond/default.nix | 4 ++-- pkgs/misc/rkdeveloptool/default.nix | 4 ++-- pkgs/misc/sailsd/default.nix | 4 ++-- pkgs/misc/screensavers/alock/default.nix | 4 ++-- pkgs/misc/screensavers/electricsheep/default.nix | 4 ++-- pkgs/misc/screensavers/light-locker/default.nix | 4 ++-- pkgs/misc/screensavers/rss-glx/default.nix | 4 ++-- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- pkgs/misc/screensavers/xssproxy/default.nix | 4 ++-- pkgs/misc/screensavers/xtrlock-pam/default.nix | 4 ++-- pkgs/misc/solfege/default.nix | 4 ++-- pkgs/misc/stabber/default.nix | 4 ++-- pkgs/misc/tpm2-pkcs11/default.nix | 4 ++-- pkgs/misc/urbit/default.nix | 4 ++-- pkgs/misc/vim-plugins/overrides.nix | 4 ++-- 73 files changed, 154 insertions(+), 154 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 6f13414701a..085ad7902f5 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib glib ]; diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index 710712fe508..c69fcbc6015 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -1,11 +1,11 @@ -{ stdenv, apulse, libpulseaudio, pkgconfig, intltool, autoreconfHook }: +{ stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }: stdenv.mkDerivation { name = "libpressureaudio-${apulse.version}"; src = libpulseaudio.src; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; dontConfigure = true; diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index 78d4228abb3..cb77a607e01 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -7,7 +7,7 @@ , libusb1 , lzop , openssl -, pkgconfig +, pkg-config , buildPackages }: @@ -38,7 +38,7 @@ let openssl libusb1 lzop - pkgconfig + pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 3be5bd7711f..f5edc729340 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, polkit, cups, fetchpatch }: stdenv.mkDerivation rec { version = "0.2.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib polkit cups ]; patches = [ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ebab134a4ff..0d740e071e1 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , removeReferencesTo , zlib , libjpeg @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' ''; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus ] diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 7477c5aa78b..8b1e7fe8fc7 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig +{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 407eef06773..ae8749f0326 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -3,7 +3,7 @@ , fetchpatch , makeWrapper , symlinkJoin -, pkgconfig +, pkg-config , libtool , gtk2 , libxml2 @@ -295,7 +295,7 @@ stdenv.mkDerivation rec { sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libxml2 diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index eae437b0a4d..db1da676a51 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }: +{ lib, stdenv, fetchpatch, fetchurl, pkg-config, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl cups dbus enscript ]; patches = [ diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 5957f30327f..9cd76c11cce 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,5 +1,5 @@ # this package was called gimp-print in the past -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig +{ stdenv, lib, fetchurl, makeWrapper, pkg-config , ijs, zlib , gimp2Support ? false, gimp , cupsSupport ? true, cups, libusb-compat-0_1, perl @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 128a5e39df7..37609a66c94 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools , bash, coreutils, util-linux @@ -60,7 +60,7 @@ python2Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; pythonPath = with python2Packages; [ diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 9622382e121..c62161c96f8 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools @@ -66,7 +66,7 @@ python2Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; pythonPath = with python2Packages; [ diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index ed0d5183347..6a7eb35ae52 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config removeReferencesTo ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 82678eec164..e2894802839 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sconsPackages, libX11, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config , libusb1, boost, glib, dbus-glib }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index a9e3d42ef9f..8fafd1b6ebc 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: +{ lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: stdenv.mkDerivation rec { name = "xwiimote-2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ncurses bluez ]; configureFlags = [ "--with-doxygen=no" ]; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 1550f71fb40..92c42a1d394 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkgconfig, sfml, lib, stdenv, zlib +, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patchPhase = '' sed -i "s|prefix=/usr/local|prefix=$out|" Makefile diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index c56a63b063b..eba646e2f20 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }: +{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python, pillow, makeWrapper }: let vasm = @@ -25,7 +25,7 @@ stdenv.mkDerivation { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r"; }; - buildInputs = [ pkgconfig SDL2 glew xcftools python pillow vasm makeWrapper ]; + buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm makeWrapper ]; preBuild = '' patchShebangs img2tiles.py ''; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 69002d00f80..3e20ba61642 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, desktop-file-utils, libpng -, pkgconfig, SDL, freetype, zlib }: +, pkg-config, SDL, freetype, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz"; }; - nativeBuildInputs = [ desktop-file-utils pkgconfig ]; + nativeBuildInputs = [ desktop-file-utils pkg-config ]; buildInputs = [ libpng SDL freetype zlib ]; makeFlags = [ diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 702a46f49aa..6db1089a37f 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,5 +1,5 @@ { pkgName, version, pkgSha256 }: -{ lib, stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: +{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; in stdenv.mkDerivation ({ inherit name buildInputs; @@ -7,7 +7,7 @@ in stdenv.mkDerivation ({ url = "mirror://sourceforge/cdemu/${name}.tar.bz2"; sha256 = pkgSha256; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; setSourceRoot = '' mkdir build cd build diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index e824e19347a..0b8090ce41d 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,4 +1,4 @@ -{ callPackage, gobject-introspection, cmake, pkgconfig +{ callPackage, gobject-introspection, cmake, pkg-config , glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: @@ -12,7 +12,7 @@ in callPackage pkg { drvParams = { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; + nativeBuildInputs = [ cmake gobject-introspection pkg-config ]; propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; }; } diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 075ad6833b1..ff17833f690 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch -, pkgconfig, libtool, intltool +, pkg-config, libtool, intltool , libXmu , lua , tinyxml @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; buildInputs = - [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch + [ pkg-config libtool intltool libXmu lua agg alsaLib soundtouch openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 2b392074a51..9112293db58 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchpatch -, pkgconfig +, pkg-config , cmake , bluez , ffmpeg_3 @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 697492797fc..7e988747308 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; }; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 439553ccc4d..458b27d3304 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen , freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive , fetchpatch }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 124203e82e9..f76fc761abb 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}: +{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkg-config}: stdenv.mkDerivation { pname = "fceux-unstable"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992"; }; - nativeBuildInputs = [ pkgconfig scons ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ zlib SDL lua5_1 ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index eb9b2f1e5cc..eef8c2c3253 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: with lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ]; meta = { diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/misc/emulators/fuse-emulator/default.nix index e2334a62a13..3426b47daea 100644 --- a/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/pkgs/misc/emulators/fuse-emulator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchurl, perl, pkg-config, wrapGAppsHook , SDL, bzip2, glib, gtk3, libgcrypt, libpng, libspectrum, libxml2, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kaynjr28w42n3iha60mgr7nxm49w8j0v49plyrc7ka24qzmiqph"; }; - nativeBuildInputs = [ perl pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ perl pkg-config wrapGAppsHook ]; buildInputs = [ SDL bzip2 glib gtk3 libgcrypt libpng libspectrum libxml2 zlib ]; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 563ea5f46f8..abc676ffa63 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 SDL nasm zlib libpng libGLU libGL ]; # Work around build failures on recent GTK. diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 5d25320068e..c7bc7e9f976 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig +, pkg-config , libX11, libXv , udev , libGLU, libGL, SDL2 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optionals stdenv.isDarwin [ libicns ]; buildInputs = [ SDL2 libao ] diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index e09ddd57c74..c7ac7a65ccd 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper -, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -46,7 +46,7 @@ in mkDerivation { ++ lib.optional stdenv.isLinux alsaLib ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] ; - nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ]; + nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ]; # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 693ada8d3c7..aaf736f3e5e 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 +{ lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freeglut diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 8e12eea31a9..e8cda5170cc 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkg-config, wrapGAppsHook , gtk2 ? null, gtk3 ? null, mednafen }: with lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 mednafen ]; configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index 98754de8d4f..dbf658b8fce 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , mkDerivation , cmake -, pkgconfig +, pkg-config , SDL2 , qtbase , libpcap @@ -21,7 +21,7 @@ mkDerivation rec { sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ SDL2 qtbase diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index a6f59122b64..03269017518 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkg-config , cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick , qtbase, qtmultimedia, qttools, minizip }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; }; - nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; + nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ]; buildInputs = [ epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 49681aaee94..f5d17d9d395 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }: +{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }: stdenv.mkDerivation rec { pname = "mupen64plus"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a21n4gqdvag6krwcjm5bnyw5phrlxw6m0mk73jy53iq03f3s96m"; }; - nativeBuildInputs = [ pkgconfig nasm ]; + nativeBuildInputs = [ pkg-config nasm ]; buildInputs = [ boost dash freetype libpng SDL which zlib ]; buildPhase = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 059b3791d11..956161209fc 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper wrapGAppsHook ]; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 0de3d61c7ee..d34a921e177 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python , alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index a71ccb46b99..7f46d9a0034 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -15,7 +15,7 @@ , libxml2 , makeWrapper , perl -, pkgconfig +, pkg-config , portaudio , SDL2 , soundtouch @@ -68,7 +68,7 @@ stdenv.mkDerivation { --set __GL_THREADED_OPTIMIZATIONS 1 ''; - nativeBuildInputs = [ cmake makeWrapper perl pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake makeWrapper perl pkg-config wrapGAppsHook ]; buildInputs = [ alsaLib diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 47a87dcca0b..e6f0ec47744 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg +{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg , wrapGAppsHook, libcdio, nasm, ffmpeg, file , fetchpatch }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ./uncompress2.patch ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file ]; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index effc34accf2..87dacd46d57 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -6,7 +6,7 @@ , lib , libzip , mkDerivation -, pkgconfig +, pkg-config , python3 , qtbase , qtmultimedia @@ -31,7 +31,7 @@ mkDerivation rec { substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share ''; - nativeBuildInputs = [ cmake pkgconfig python3 ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ SDL2 diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index b38692de263..6c6a52fc65c 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, qttools, pkgconfig +, fetchurl, qttools, pkg-config , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns , rsync, SDL2, xwininfo @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; - nativeBuildInputs = [ qttools pkgconfig ]; + nativeBuildInputs = [ qttools pkg-config ]; buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit qttranslations qtxmlpatterns rsync SDL2 xwininfo zlib util-linux xorg.libxcb ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 06e4a71055b..c1b60ad63b2 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl @@ -288,7 +288,7 @@ in with lib.licenses; }; description = "Port of Citra to libretro"; license = gpl2Plus; - extraNativeBuildInputs = [ cmake pkgconfig ]; + extraNativeBuildInputs = [ cmake pkg-config ]; extraBuildInputs = [ libGLU libGL boost ]; makefile = "Makefile"; cmakeFlags = [ @@ -342,7 +342,7 @@ in with lib.licenses; description = "Port of Dolphin to libretro"; license = gpl2Plus; - extraNativeBuildInputs = [ cmake curl pkgconfig ]; + extraNativeBuildInputs = [ cmake curl pkg-config ]; extraBuildInputs = [ libGLU libGL pcre sfml gettext hidapi @@ -838,7 +838,7 @@ in with lib.licenses; }; description = "ppsspp libretro port"; license = gpl2; - extraNativeBuildInputs = [ cmake pkgconfig ]; + extraNativeBuildInputs = [ cmake pkg-config ]; extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; @@ -981,7 +981,7 @@ in with lib.licenses; }; description = "Port of Stella to libretro"; license = gpl2; - extraBuildInputs = [ libpng pkgconfig SDL ]; + extraBuildInputs = [ libpng pkg-config SDL ]; makefile = "Makefile"; preBuild = "cd src/libretro"; dontConfigure = true; @@ -1020,7 +1020,7 @@ in with lib.licenses; }; description = "Port of TIC-80 to libretro"; license = mit; - extraNativeBuildInputs = [ cmake pkgconfig ]; + extraNativeBuildInputs = [ cmake pkg-config ]; makefile = "Makefile"; cmakeFlags = [ "-DBUILD_LIBRETRO=ON" diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 9a01bdb78b5..a6ada570a50 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper , ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - nativeBuildInputs = [ pkgconfig wayland ] + nativeBuildInputs = [ pkg-config wayland ] ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index f69505b65f1..558b5ca6337 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig +{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config python ]; buildInputs = [ glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 4ed6852c17e..ecda439e7ab 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git +{ mkDerivation, lib, fetchgit, cmake, pkg-config, git , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng , ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio @@ -35,7 +35,7 @@ mkDerivation { "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 254c4a329e5..6698d0a5b48 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 4c51759e71e..2e96dc03d14 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -3,7 +3,7 @@ , lib , libarchive , autoreconfHook -, pkgconfig +, pkg-config , glib , libusb1 , darwin @@ -20,7 +20,7 @@ let url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ]; configureFlags = [ "--enable-iconv" ]; }; @@ -31,7 +31,7 @@ let url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib libusb1 ]; configureFlags = [ "--enable-libusb10" ]; }; @@ -42,7 +42,7 @@ let url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ] ++ lib.optionals stdenv.isLinux [ acl ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; @@ -54,7 +54,7 @@ let url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib libticonv libarchive lzma bzip2 ]; }; in @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; NIX_CFLAGS_COMPILE = [ "-lm" ]; meta = with lib; { diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 0cce4a926c3..75b86eaeebd 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: +{lib, stdenv, fetchurl, pkg-config, gtk2, alsaLib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 378a238d049..c21f67845db 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -6,7 +6,7 @@ , gettext , libGLU, libGL , openal -, pkgconfig +, pkg-config , SDL2 , sfml , zip @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ cairo diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index c7524427504..7d63927e33f 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw -, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem +, pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL - pkgconfig gtk2 SDL autoreconfHook libXaw ]; + pkg-config gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index f5bab913de1..633d44bb5ae 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext +{ lib, stdenv, fetchurl, pkg-config, glib, libXaw, libX11, libXext , libDSKSupport ? true, libdsk , motifSupport ? false, lesstif }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libdsk libXaw libX11 libXext ] ++ optional libDSKSupport libdsk diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 80ddc32ac6c..43f077227db 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; patches = [ diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index 2248696d667..5bb01b9fca0 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, wrapQtAppsHook +, cmake, pkg-config, wrapQtAppsHook , boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 , udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg , libpulseaudio, libjack2, alsaLib, sndio, ecasound @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ] ++ lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ] diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 16f46d8796a..9f5f022b853 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchpatch, autoreconfHook -, pkgconfig, libtool, boost, SDL +, pkg-config, libtool, boost, SDL , glib, pango, gettext, curl, xorg , libpng, libjpeg, giflib, speex, atk @@ -80,7 +80,7 @@ stdenv.mkDerivation { sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ glib gettext boost curl SDL speex xorg.libXmu xorg.libSM xorg.libXt diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index a01668e138f..9e1efd5f836 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config, zlib, serd }: stdenv.mkDerivation rec { pname = "hdt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib serd ]; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index fd50aa6de54..f10b5a6718d 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "0pzgrjy5fi2nif2j442fs3j2bbshxpnmq9kzwcqz54wx1w8fzdfr"; }; - nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; + nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 26d7cf18dd5..ea7356b32e9 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config # Optional Dependencies , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (lib.enableFeature (optLibffado != null) "firewire") ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 6b2fa372b5d..4139c5b0f13 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, libpulseaudio }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index bd33997d09a..fae02cdbcd9 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm , llvm, glibmm }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 44dbf086ca5..f005a59dbfa 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile -, python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex +, python2, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , makeWrapper, t1utils , texlive, tex ? texlive.combine { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR/home ''; - nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index f149072a7bb..9ef7013fbfd 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1 }: stdenv.mkDerivation { pname = "rkdeveloptool"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 2c67853ae31..d2f91c42638 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, jansson }: +{ lib, stdenv, fetchFromGitHub, pkg-config, jansson }: let libsailing = fetchFromGitHub { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1s4nlffp683binbdxwwzbsci61kbjylbcr1jf44sv1h1r5d5js05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ jansson libsailing ]; INSTALL_PATH = "$(out)"; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 34574545750..d10082a71e3 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, autoreconfHook +{ lib, stdenv, fetchgit, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--enable-imlib2" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook libX11 pam libgcrypt libXrender imlib2 diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index b9aa0872839..ea68e147ba7 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL +, libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 0853a25a3eb..ef1143f4143 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -3,7 +3,7 @@ , nix-update-script , meson , ninja -, pkgconfig +, pkg-config , gtk3 , glib , intltool @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { intltool meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 70ff0b18821..f3e5ae251ae 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: +{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 820af768548..5f41090d05f 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 +{ lib, stdenv, fetchurl, pkg-config, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib , forceInstallAllHacks ? false @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam + [ pkg-config bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf gdk-pixbuf-xlib diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index cfe1efc02c8..5e1c4208413 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }: +{ lib, stdenv, fetchFromGitHub, glib, pkg-config, xorg, dbus }: let rev = "1.0.0"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib xorg.libX11 xorg.libXScrnSaver dbus ]; makeFlags = [ diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index a99020ad305..c563cca05ef 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: +{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { name = "xtrlock-pam-3.4-post-20150909"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python xlibsWrapper pam ]; configurePhase = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 71d9d682be4..af2ce3f53cf 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gettext, pkgconfig, texinfo, wrapGAppsHook +{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook , buildPythonApplication, pycairo, pygobject3 , gobject-introspection, gtk3, librsvg , alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond @@ -19,7 +19,7 @@ buildPythonApplication rec { ./webbrowser.patch ]; - nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ]; + nativeBuildInputs = [ gettext pkg-config texinfo wrapGAppsHook ]; buildInputs = [ gobject-introspection gtk3 librsvg ]; propagatedBuildInputs = [ pycairo pygobject3 ]; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index 2db68968801..eb0d6a4109d 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat , libmicrohttpd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { mkdir m4 ''; - buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ]; + buildInputs = [ autoreconfHook pkg-config glib expat libmicrohttpd ]; meta = { description = "Stubbed XMPP Server"; diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 610a8e06385..232b86b1e7a 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, substituteAll -, pkgconfig, autoreconfHook, autoconf-archive, makeWrapper, patchelf +, pkg-config, autoreconfHook, autoconf-archive, makeWrapper, patchelf , tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python37, glibc, libyaml , abrmdSupport ? true, tpm2-abrmd ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig autoreconfHook autoconf-archive makeWrapper patchelf + pkg-config autoreconfHook autoconf-archive makeWrapper patchelf ]; buildInputs = [ tpm2-tss tpm2-tools opensc openssl sqlite libyaml diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 97f5edd94b3..9ea1fc64c3f 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja -, openssl, pkgconfig, re2c, zlib +, openssl, pkg-config, re2c, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ninja meson ]; + nativeBuildInputs = [ pkg-config ninja meson ]; buildInputs = [ curl git gmp libsigsegv ncurses openssl re2c zlib ]; postPatch = '' diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 78544df4cc4..c47ae5aa658 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -2,7 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , llvmPackages, rustPlatform, buildGoModule -, pkgconfig, curl, openssl, libgit2, libiconv +, pkg-config, curl, openssl, libgit2, libiconv , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake @@ -642,7 +642,7 @@ self: super: { src = old.src; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ From 76f93cc7313a1c32f7d76cf07c154e7bcafe251c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 10:51:22 +0700 Subject: [PATCH 32/38] pkgs/tools: pkgconfig -> pkg-config --- pkgs/tools/archivers/snzip/default.nix | 4 ++-- pkgs/tools/archivers/wimlib/default.nix | 4 ++-- pkgs/tools/archivers/xarchive/default.nix | 4 ++-- pkgs/tools/archivers/xarchiver/default.nix | 4 ++-- pkgs/tools/cd-dvd/brasero/default.nix | 4 ++-- pkgs/tools/cd-dvd/cdrdao/default.nix | 4 ++-- pkgs/tools/cd-dvd/dvdisaster/default.nix | 4 ++-- pkgs/tools/cd-dvd/lsdvd/default.nix | 4 ++-- pkgs/tools/misc/alarm-clock-applet/default.nix | 4 ++-- pkgs/tools/misc/antimicroX/default.nix | 4 ++-- pkgs/tools/misc/birdfont/default.nix | 4 ++-- pkgs/tools/misc/birdfont/xmlbird.nix | 4 ++-- pkgs/tools/misc/blink1-tool/default.nix | 4 ++-- pkgs/tools/misc/bmon/default.nix | 4 ++-- pkgs/tools/misc/brltty/default.nix | 4 ++-- pkgs/tools/misc/chafa/default.nix | 4 ++-- pkgs/tools/misc/ckb-next/default.nix | 4 ++-- pkgs/tools/misc/colord-gtk/default.nix | 4 ++-- pkgs/tools/misc/colord/default.nix | 4 ++-- pkgs/tools/misc/dbus-map/default.nix | 4 ++-- pkgs/tools/misc/ddccontrol/default.nix | 4 ++-- pkgs/tools/misc/ddcutil/default.nix | 4 ++-- pkgs/tools/misc/desktop-file-utils/default.nix | 4 ++-- pkgs/tools/misc/duc/default.nix | 4 ++-- pkgs/tools/misc/eot-utilities/default.nix | 4 ++-- pkgs/tools/misc/exa/default.nix | 4 ++-- pkgs/tools/misc/ffsend/default.nix | 4 ++-- pkgs/tools/misc/flashrom/default.nix | 4 ++-- pkgs/tools/misc/fontforge/default.nix | 4 ++-- pkgs/tools/misc/fwup/default.nix | 4 ++-- pkgs/tools/misc/g933-utils/default.nix | 4 ++-- pkgs/tools/misc/gbdfed/default.nix | 4 ++-- pkgs/tools/misc/gnokii/default.nix | 4 ++-- pkgs/tools/misc/goaccess/default.nix | 4 ++-- pkgs/tools/misc/gparted/default.nix | 4 ++-- pkgs/tools/misc/grub/2.0x.nix | 4 ++-- pkgs/tools/misc/gsmartcontrol/default.nix | 4 ++-- pkgs/tools/misc/hashit/default.nix | 4 ++-- pkgs/tools/misc/hhpc/default.nix | 4 ++-- pkgs/tools/misc/ideviceinstaller/default.nix | 4 ++-- pkgs/tools/misc/idevicerestore/default.nix | 4 ++-- pkgs/tools/misc/journaldriver/default.nix | 4 ++-- pkgs/tools/misc/ldapvi/default.nix | 4 ++-- pkgs/tools/misc/ldmtool/default.nix | 4 ++-- pkgs/tools/misc/libbitcoin/libbitcoin-client.nix | 4 ++-- pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix | 4 ++-- pkgs/tools/misc/libbitcoin/libbitcoin-network.nix | 4 ++-- pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix | 4 ++-- pkgs/tools/misc/libbitcoin/libbitcoin.nix | 4 ++-- pkgs/tools/misc/linuxquota/default.nix | 4 ++-- pkgs/tools/misc/man-db/default.nix | 4 ++-- pkgs/tools/misc/mc/default.nix | 4 ++-- pkgs/tools/misc/mdbtools/default.nix | 4 ++-- pkgs/tools/misc/microplane/deps.nix | 2 +- pkgs/tools/misc/minicom/default.nix | 4 ++-- pkgs/tools/misc/mongodb-tools/default.nix | 4 ++-- pkgs/tools/misc/mpdscribble/default.nix | 4 ++-- pkgs/tools/misc/notify-desktop/default.nix | 4 ++-- pkgs/tools/misc/opencorsairlink/default.nix | 4 ++-- pkgs/tools/misc/osinfo-db-tools/default.nix | 4 ++-- pkgs/tools/misc/pal/default.nix | 4 ++-- pkgs/tools/misc/paps/default.nix | 4 ++-- pkgs/tools/misc/parcellite/default.nix | 4 ++-- pkgs/tools/misc/pick/default.nix | 4 ++-- pkgs/tools/misc/plotinus/default.nix | 4 ++-- pkgs/tools/misc/powerline-rs/default.nix | 4 ++-- pkgs/tools/misc/progress/default.nix | 4 ++-- pkgs/tools/misc/pspg/default.nix | 4 ++-- pkgs/tools/misc/qjoypad/default.nix | 4 ++-- pkgs/tools/misc/riemann-c-client/default.nix | 4 ++-- pkgs/tools/misc/rmlint/default.nix | 4 ++-- pkgs/tools/misc/rockbox-utility/default.nix | 4 ++-- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- pkgs/tools/misc/rrdtool/default.nix | 4 ++-- pkgs/tools/misc/sd-mux-ctrl/default.nix | 4 ++-- pkgs/tools/misc/silicon/default.nix | 4 ++-- pkgs/tools/misc/slop/default.nix | 4 ++-- pkgs/tools/misc/snapper/default.nix | 4 ++-- pkgs/tools/misc/subberthehut/default.nix | 4 ++-- pkgs/tools/misc/system-config-printer/default.nix | 4 ++-- pkgs/tools/misc/systrayhelper/default.nix | 4 ++-- pkgs/tools/misc/tensorman/default.nix | 4 ++-- pkgs/tools/misc/timidity/default.nix | 4 ++-- pkgs/tools/misc/tldr/default.nix | 4 ++-- pkgs/tools/misc/tmate/default.nix | 4 ++-- pkgs/tools/misc/tmux/default.nix | 4 ++-- pkgs/tools/misc/toilet/default.nix | 4 ++-- pkgs/tools/misc/ttfautohint/default.nix | 4 ++-- pkgs/tools/misc/ttwatch/default.nix | 4 ++-- pkgs/tools/misc/tty-clock/default.nix | 4 ++-- pkgs/tools/misc/ultrastar-creator/default.nix | 4 ++-- pkgs/tools/misc/ultrastar-manager/default.nix | 4 ++-- pkgs/tools/misc/unclutter-xfixes/default.nix | 4 ++-- pkgs/tools/misc/urjtag/default.nix | 4 ++-- pkgs/tools/misc/usbmuxd/default.nix | 4 ++-- pkgs/tools/misc/websocat/default.nix | 4 ++-- pkgs/tools/misc/wl-clipboard/default.nix | 4 ++-- pkgs/tools/misc/wlr-randr/default.nix | 4 ++-- pkgs/tools/misc/wv/default.nix | 4 ++-- pkgs/tools/misc/xburst-tools/default.nix | 4 ++-- pkgs/tools/misc/xiccd/default.nix | 4 ++-- pkgs/tools/misc/yad/default.nix | 4 ++-- pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++-- pkgs/tools/misc/yubikey-personalization-gui/default.nix | 4 ++-- pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++-- pkgs/tools/networking/acme-client/default.nix | 4 ++-- pkgs/tools/networking/aircrack-ng/default.nix | 4 ++-- pkgs/tools/networking/airfield/node.nix | 2 +- pkgs/tools/networking/argus-clients/default.nix | 4 ++-- pkgs/tools/networking/argus/default.nix | 4 ++-- pkgs/tools/networking/aria2/default.nix | 4 ++-- pkgs/tools/networking/axel/default.nix | 4 ++-- pkgs/tools/networking/ccnet/default.nix | 4 ++-- pkgs/tools/networking/chrony/default.nix | 4 ++-- pkgs/tools/networking/connman/connman-gtk/default.nix | 4 ++-- pkgs/tools/networking/connman/connman-ncurses/default.nix | 4 ++-- pkgs/tools/networking/connman/connman.nix | 4 ++-- pkgs/tools/networking/davix/default.nix | 4 ++-- pkgs/tools/networking/dd-agent/datadog-agent.nix | 4 ++-- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- pkgs/tools/networking/dnscrypt-wrapper/default.nix | 4 ++-- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- pkgs/tools/networking/dnsperf/default.nix | 4 ++-- pkgs/tools/networking/driftnet/default.nix | 4 ++-- pkgs/tools/networking/fastd/default.nix | 4 ++-- pkgs/tools/networking/gftp/default.nix | 4 ++-- pkgs/tools/networking/gmrender-resurrect/default.nix | 4 ++-- pkgs/tools/networking/gupnp-tools/default.nix | 4 ++-- pkgs/tools/networking/horst/default.nix | 4 ++-- pkgs/tools/networking/httplz/default.nix | 4 ++-- pkgs/tools/networking/hyenae/default.nix | 4 ++-- pkgs/tools/networking/inadyn/default.nix | 4 ++-- pkgs/tools/networking/ip2unix/default.nix | 4 ++-- pkgs/tools/networking/jnettop/default.nix | 4 ++-- pkgs/tools/networking/junkie/default.nix | 4 ++-- pkgs/tools/networking/keepalived/default.nix | 4 ++-- pkgs/tools/networking/lftp/default.nix | 4 ++-- pkgs/tools/networking/libnids/default.nix | 4 ++-- pkgs/tools/networking/libreswan/default.nix | 4 ++-- pkgs/tools/networking/lldpd/default.nix | 4 ++-- pkgs/tools/networking/maildrop/default.nix | 4 ++-- pkgs/tools/networking/mailutils/default.nix | 4 ++-- pkgs/tools/networking/maxscale/default.nix | 4 ++-- pkgs/tools/networking/memtier-benchmark/default.nix | 4 ++-- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- pkgs/tools/networking/mmsd/default.nix | 4 ++-- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- pkgs/tools/networking/mosh/default.nix | 4 ++-- pkgs/tools/networking/mu/default.nix | 4 ++-- pkgs/tools/networking/nbd/default.nix | 4 ++-- pkgs/tools/networking/ndjbdns/default.nix | 4 ++-- pkgs/tools/networking/network-manager/0.9.8/default.nix | 4 ++-- pkgs/tools/networking/network-manager/default.nix | 4 ++-- pkgs/tools/networking/network-manager/iodine/default.nix | 4 ++-- pkgs/tools/networking/network-manager/l2tp/default.nix | 4 ++-- .../networking/network-manager/openconnect/default.nix | 4 ++-- pkgs/tools/networking/network-manager/openvpn/default.nix | 4 ++-- pkgs/tools/networking/network-manager/sstp/default.nix | 4 ++-- .../tools/networking/network-manager/strongswan/default.nix | 4 ++-- pkgs/tools/networking/network-manager/vpnc/default.nix | 4 ++-- pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++-- pkgs/tools/networking/ntopng/default.nix | 4 ++-- pkgs/tools/networking/nzbget/default.nix | 4 ++-- pkgs/tools/networking/ocserv/default.nix | 4 ++-- pkgs/tools/networking/ofono/default.nix | 4 ++-- pkgs/tools/networking/openconnect/default.nix | 4 ++-- pkgs/tools/networking/openconnect_pa/default.nix | 6 +++--- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- pkgs/tools/networking/openssh/default.nix | 6 +++--- pkgs/tools/networking/p2p/amule/default.nix | 4 ++-- pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 4 ++-- pkgs/tools/networking/p2p/libtorrent/default.nix | 4 ++-- pkgs/tools/networking/p2p/rtorrent/default.nix | 4 ++-- pkgs/tools/networking/phodav/default.nix | 4 ++-- pkgs/tools/networking/pmacct/default.nix | 4 ++-- pkgs/tools/networking/radvd/default.nix | 4 ++-- pkgs/tools/networking/saldl/default.nix | 4 ++-- pkgs/tools/networking/shadowsocks-rust/default.nix | 4 ++-- pkgs/tools/networking/sniffglue/default.nix | 4 ++-- pkgs/tools/networking/spoofer/default.nix | 4 ++-- pkgs/tools/networking/sstp/default.nix | 4 ++-- pkgs/tools/networking/strongswan/default.nix | 4 ++-- pkgs/tools/networking/tinyfecvpn/default.nix | 4 ++-- pkgs/tools/networking/tlspool/default.nix | 4 ++-- pkgs/tools/networking/tox-node/default.nix | 4 ++-- pkgs/tools/networking/ua/default.nix | 4 ++-- pkgs/tools/networking/uget/default.nix | 4 ++-- pkgs/tools/networking/wget/default.nix | 4 ++-- pkgs/tools/networking/whois/default.nix | 4 ++-- pkgs/tools/networking/xnbd/default.nix | 4 ++-- pkgs/tools/nix/cached-nix-shell/default.nix | 2 +- pkgs/tools/security/acsccid/default.nix | 4 ++-- pkgs/tools/security/afl/qemu.nix | 4 ++-- pkgs/tools/security/aflplusplus/qemu.nix | 4 ++-- pkgs/tools/security/aws-okta/default.nix | 4 ++-- pkgs/tools/security/bitwarden_rs/default.nix | 4 ++-- pkgs/tools/security/ccid/default.nix | 4 ++-- pkgs/tools/security/chaps/default.nix | 4 ++-- pkgs/tools/security/chrome-token-signing/default.nix | 4 ++-- pkgs/tools/security/clevis/default.nix | 4 ++-- pkgs/tools/security/crackxls/default.nix | 4 ++-- pkgs/tools/security/ecdsautils/default.nix | 2 +- pkgs/tools/security/ecryptfs/default.nix | 4 ++-- pkgs/tools/security/eid-mw/default.nix | 4 ++-- pkgs/tools/security/fpm2/default.nix | 4 ++-- pkgs/tools/security/fprintd/default.nix | 4 ++-- pkgs/tools/security/gencfsm/default.nix | 4 ++-- pkgs/tools/security/gnupg-pkcs11-scd/default.nix | 4 ++-- pkgs/tools/security/gnupg/22.nix | 4 ++-- pkgs/tools/security/ifdnfc/default.nix | 4 ++-- pkgs/tools/security/keycard-cli/default.nix | 4 ++-- pkgs/tools/security/kwalletcli/default.nix | 4 ++-- pkgs/tools/security/lastpass-cli/default.nix | 4 ++-- pkgs/tools/security/libacr38u/default.nix | 4 ++-- pkgs/tools/security/libmodsecurity/default.nix | 4 ++-- pkgs/tools/security/mfcuk/default.nix | 4 ++-- pkgs/tools/security/mfoc/default.nix | 4 ++-- pkgs/tools/security/modsecurity/default.nix | 4 ++-- pkgs/tools/security/neopg/default.nix | 4 ++-- pkgs/tools/security/nitrokey-app/default.nix | 4 ++-- pkgs/tools/security/nmap/default.nix | 4 ++-- pkgs/tools/security/nmap/qt.nix | 4 ++-- pkgs/tools/security/nsjail/default.nix | 4 ++-- pkgs/tools/security/nwipe/default.nix | 4 ++-- pkgs/tools/security/oath-toolkit/default.nix | 4 ++-- pkgs/tools/security/opensc/default.nix | 4 ++-- pkgs/tools/security/pcsc-cyberjack/default.nix | 4 ++-- pkgs/tools/security/pcsclite/default.nix | 4 ++-- pkgs/tools/security/pcsctools/default.nix | 4 ++-- pkgs/tools/security/pinentry/default.nix | 4 ++-- pkgs/tools/security/polkit-gnome/default.nix | 4 ++-- pkgs/tools/security/proxmark3/default.nix | 4 ++-- pkgs/tools/security/qdigidoc/default.nix | 4 ++-- pkgs/tools/security/rbw/default.nix | 4 ++-- pkgs/tools/security/ripasso/cursive.nix | 4 ++-- pkgs/tools/security/rng-tools/default.nix | 4 ++-- pkgs/tools/security/sbsigntool/default.nix | 4 ++-- pkgs/tools/security/signify/default.nix | 4 ++-- pkgs/tools/security/sn0int/default.nix | 4 ++-- pkgs/tools/security/stoken/default.nix | 4 ++-- pkgs/tools/security/thc-hydra/default.nix | 4 ++-- pkgs/tools/security/tor/default.nix | 4 ++-- pkgs/tools/security/tpm2-tools/default.nix | 4 ++-- pkgs/tools/security/trousers/default.nix | 4 ++-- pkgs/tools/security/yubikey-agent/default.nix | 4 ++-- pkgs/tools/security/zmap/default.nix | 4 ++-- pkgs/tools/security/zzuf/default.nix | 4 ++-- pkgs/tools/video/dvgrab/default.nix | 4 ++-- pkgs/tools/video/mjpegtools/default.nix | 4 ++-- pkgs/tools/video/swfmill/default.nix | 4 ++-- pkgs/tools/virtualization/distrobuilder/default.nix | 4 ++-- 251 files changed, 500 insertions(+), 500 deletions(-) diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/tools/archivers/snzip/default.nix index 1f4a0f12ff2..f3a94006873 100644 --- a/pkgs/tools/archivers/snzip/default.nix +++ b/pkgs/tools/archivers/snzip/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , snappy }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; # We don't use a release tarball so we don't have a `./configure` script to # run. That's why we generate it. - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "A compression/decompression tool based on snappy"; diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 8272b2fe598..4f397b9bf55 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper -, pkgconfig, openssl, fuse, libxml2 +, pkg-config, openssl, fuse, libxml2 , cabextract ? null , cdrkit ? null , mtools ? null @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.13.2"; pname = "wimlib"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl fuse libxml2 ntfs3g ]; src = fetchurl { diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 12490d96cb4..d28e9f31b1a 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation rec { version = "0.2.8-6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e7c3392731a..815bf823d58 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper, +{ lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper, coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; }; - nativeBuildInputs = [ pkgconfig makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook ]; buildInputs = [ gtk3 intltool libxslt ]; postFixup = '' diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 727c092e3aa..ea720f4f3eb 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify +{ stdenv, lib, fetchurl, pkg-config, gtk3, itstool, gst_all_1, libxml2, libnotify , libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs , vcdimager, wrapGAppsHook, hicolor-icon-theme }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; - nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config itstool intltool wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs hicolor-icon-theme diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 85bebad2723..3fca8b2cd3c 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: +{lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvorbis libmad libao ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 686c1f0ad72..e6f98bdee31 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, which +{ lib, stdenv, fetchurl, pkg-config, gettext, which , glib, gtk2 , enableSoftening ? true }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"; }; - nativeBuildInputs = [ gettext pkgconfig which ]; + nativeBuildInputs = [ gettext pkg-config which ]; buildInputs = [ glib gtk2 ]; patches = lib.optional enableSoftening [ diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 7847720dc6d..a202ee9376b 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libdvdread, pkgconfig }: +{ lib, stdenv, fetchurl, libdvdread, pkg-config }: let version = "0.17"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libdvdread ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://sourceforge.net/projects/lsdvd/"; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 6ad9341b85e..5585b6901dc 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig +, pkg-config , autoconf , automake111x , libtool @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool automake111x autoconf diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix index cb5496d450c..452906a1cf8 100644 --- a/pkgs/tools/misc/antimicroX/default.nix +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -2,7 +2,7 @@ , lib , cmake , extra-cmake-modules -, pkgconfig +, pkg-config , SDL2 , qtbase , qttools @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; }; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; buildInputs = [ SDL2 qtbase diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index cdce76a324c..609899bbe30 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, xmlbird, +{ lib, stdenv, fetchurl, pkg-config, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; }; - nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 3f103024d89..cacebb93995 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: +{ lib, stdenv, fetchurl, python3, pkg-config, vala, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "xmlbird"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04"; }; - nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection ]; buildInputs = [ glib ]; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 76fadcb7c15..23096bb2eaf 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libusb1, pkgconfig, ... }: +{ lib, stdenv, fetchurl, libusb1, pkg-config, ... }: stdenv.mkDerivation rec { pname = "blink1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; configurePhase = '' diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index af7e3a3d642..ca5f99f3b62 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses libconfuse libnl ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 244e945bb20..b71740c325a 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, bluez +{ lib, stdenv, fetchurl, pkg-config, python3, bluez , alsaSupport ? stdenv.isLinux, alsaLib ? null , systemdSupport ? stdenv.isLinux, systemd ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; }; - nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; + nativeBuildInputs = [ pkg-config python3.pkgs.cython ]; buildInputs = [ bluez ] ++ lib.optional alsaSupport alsaLib ++ lib.optional systemdSupport systemd; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 262fd853d10..f196bb5af03 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool - pkgconfig + pkg-config which libxslt libxml2 diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index fefb797dbd0..6c13c3bbe6a 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev -, pkgconfig, qtbase, cmake, zlib, kmod }: +, pkg-config, qtbase, cmake, zlib, kmod }: mkDerivation rec { version = "0.4.2"; @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 403b3df0753..d77204836b2 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -12,7 +12,7 @@ , libxslt , glib , gtk3 -, pkgconfig +, pkg-config , lcms2 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 8a8d110f4e9..89435332c9c 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -4,7 +4,7 @@ , bash-completion , glib , polkit -, pkgconfig +, pkg-config , gettext , gusb , lcms2 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config shared-mime-info vala wrapGAppsHook diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index c311de3a779..5960ba5c573 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: +{ stdenv, lib, fetchFromGitHub, pkg-config, glib, procps, libxml2 }: stdenv.mkDerivation { pname = "dbus-map"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib procps libxml2 ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 4e3733533a8..604ba0cbf75 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 -, pciutils, pkgconfig, gtk2, ddccontrol-db +, pciutils, pkg-config, gtk2, ddccontrol-db , makeDesktopItem }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ libxml2 diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 4a3e8aa9e34..4f519d6858d 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ i2c-tools udev libgudev glib libusb1 libdrm xorg.libXrandr diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 93e711a4a86..09c0e0d25c6 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libintl }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libintl ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 4879e186b5a..570535f80e4 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , tokyocabinet, ncurses , cairo ? null, pango ? null , enableCairo ? stdenv.isLinux @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ tokyocabinet ncurses ] ++ lib.optionals enableCairo [ cairo pango ]; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 53aa696a4fd..516c9e42617 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig }: +{lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "eot_utilities"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { homepage = "http://www.w3.org/Tools/eot-utils/"; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 890edc5d0ca..83aa6c505d3 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkgconfig, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib , darwin, libiconv, installShellFiles }: @@ -26,7 +26,7 @@ buildRustPackage rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 743d930fdf8..4c92a0be792 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl +{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl , darwin, installShellFiles , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD @@ -27,7 +27,7 @@ buildRustPackage rec { cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w"; - nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) else [ openssl ]; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 47d4fd12757..8fcfa9acb1f 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , libftdi1 , libusb1 , pciutils @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; - nativeBuildInputs = [ meson pkgconfig ninja ]; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 0e1671071bd..2140e405ff4 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib , fetchpatch -, cmake, perl, uthash, pkgconfig, gettext +, cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index b3864aff44b..4d072e6d2bf 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium , libarchive, darwin, coreutils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.DiskArbitration diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 67e3b3b6ea3..9cb05609772 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkg-config }: rustPlatform.buildRustPackage rec { pname = "g933-utils"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16xgk4rc36d6lylh2dzv63ryq9s7fli3h2qva1m1p6f0gpasnk7w"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; meta = with lib; { diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 5856a73781e..ded2864dbc6 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -1,4 +1,4 @@ - { lib, stdenv, fetchurl, pkgconfig, freetype, gtk }: + { lib, stdenv, fetchurl, pkg-config, freetype, gtk }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype gtk ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 13f2691e69f..9803e8db016 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez +{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkg-config, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl intltool gettext libusb-compat-0_1 - glib gtk2 pkgconfig bluez readline + glib gtk2 pkg-config bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 57504f8a3ab..4a02e921f47 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }: stdenv.mkDerivation rec { version = "1.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmaxminddb ncurses diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 849db12cfa7..b1884da5553 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 -, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2 +, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d3761f34cda..a94275d7e35 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python3 pkgconfig autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index b86c3cc75e3..2dffada9fe7 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { version="1.1.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ./fix-paths.patch ]; - nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 36b1770791b..edda48bdc92 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index a4ba369665e..5f02121e59f 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, xorg, pkgconfig}: +{lib, stdenv, fetchFromGitHub, xorg, pkg-config}: stdenv.mkDerivation rec { pname = "hhpc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 ]; installPhase = '' diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 9d1857c1136..f25c2eb62f6 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, libzip, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, libzip, libimobiledevice }: stdenv.mkDerivation rec { pname = "ideviceinstaller"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xp0sjgfx2z19x9mxihn18ybsmrnrcfc55zbh5a44g3vrmagmlzz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; + nativeBuildInputs = [ autoreconfHook pkg-config usbmuxd libimobiledevice libzip ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 605b7bfc3ce..3e4739ee032 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl , libimobiledevice , libirecovery @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 77df7ab6908..70460d86fc9 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, systemd }: rustPlatform.buildRustPackage rec { pname = "journaldriver"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl systemd ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 6e7fcfa62b6..9b57a295de0 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: +{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkg-config, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation { pname = "ldapvi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; preConfigure = '' diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 4a965cbe165..a826f3a0de5 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkg-config, libuuid, libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl , fetchpatch }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin libtool readline gobject-introspection json-glib libuuid ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 71a9233fab5..6f9c07209cf 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libbitcoin libbitcoin-protocol ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index fe7290f801b..dd0ed857314 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin-client libbitcoin-network ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 42f3669cad0..48dab31e9a8 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, zeromq }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin zeromq ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 469e7e83085..1d8af4a336b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin secp256k1 ]; propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 5198676cb75..122aed696fc 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, secp256k1 }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ secp256k1 ]; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 58c6c1d5351..729dc41a107 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: +{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { version = "4.05"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ e2fsprogs openldap ]; meta = with lib; { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 5f2c7a751bd..44cb6962b8e 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { name = "man-db-2.9.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 153c0d59389..674b39c51af 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gpm , file @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ file diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index aedaa364888..1c327365916 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, glib, readline -, bison, flex, pkgconfig, autoreconfHook, libxslt, makeWrapper +, bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper , txt2man, which # withUi currently doesn't work. It compiles but fails to run. , withUi ? false, gtk2, gnome2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; nativeBuildInputs = [ - pkgconfig bison flex autoreconfHook txt2man which + pkg-config bison flex autoreconfHook txt2man which ] ++ lib.optional withUi libxslt; buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; diff --git a/pkgs/tools/misc/microplane/deps.nix b/pkgs/tools/misc/microplane/deps.nix index f415bae4507..defbd0d573c 100644 --- a/pkgs/tools/misc/microplane/deps.nix +++ b/pkgs/tools/misc/microplane/deps.nix @@ -225,4 +225,4 @@ sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 15df26d5cc6..d237c3b7fdd 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkg-config , lrzsz, ncurses, libiconv }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index d497505d9b7..0415955e092 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -3,7 +3,7 @@ , buildGoPackage , fetchFromGitHub , openssl -, pkgconfig +, pkg-config , libpcap }: @@ -35,7 +35,7 @@ in buildGoPackage { sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libpcap ]; # Mongodb incorrectly names all of their binaries main diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 4e033a44cfd..182e844eb84 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; meta = with lib; { diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 03e7fbb5c02..c906443b07c 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, dbus, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, dbus, pkg-config }: stdenv.mkDerivation { pname = "notify-desktop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1brcvl2fx0yzxj9mc8hzfl32zdka1f1bxpzsclcsjplyakyinr1a"; }; - buildInputs = [ dbus pkgconfig ]; + buildInputs = [ dbus pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 345df9cfbf4..14f955be1cd 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { name = "OpenCorsairLink-${version}"; version = "2019-12-23"; buildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 298a7da6e2a..e7a5d38a916 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with lib; { diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 6be42f576a4..635c6e0b524 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, glib, gettext, readline, pkgconfig }: +{lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }: stdenv.mkDerivation rec { name = "pal-0.4.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gettext readline ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix index 3a8040bd5f1..ca6607b2f18 100644 --- a/pkgs/tools/misc/paps/default.nix +++ b/pkgs/tools/misc/paps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoconf, automake, pkgconfig, intltool, pango }: +, autoconf, automake, pkg-config, intltool, pango }: stdenv.mkDerivation rec { pname = "paps"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495"; }; - nativeBuildInputs = [ autoconf automake pkgconfig intltool ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool ]; buildInputs = [ pango ]; preConfigure = '' diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 861d83bcfce..615e9e528d7 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor-icon-theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkg-config , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 hicolor-icon-theme ]; NIX_LDFLAGS = "-lgio-2.0"; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index ac446e7f341..a8203978fee 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "pick"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index c7aff75dca5..112010c8008 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gettext , libxml2 -, pkgconfig +, pkg-config , gtk3 , cmake , ninja @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook vala cmake diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 6df48f0effb..4e5a3476f53 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkg-config, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp"; - nativeBuildInputs = [ pkgconfig file perl cmake curl ]; + nativeBuildInputs = [ pkg-config file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; COMPLETION_OUT = "out"; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index dbf844a4f9d..4f27cd239d1 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, which }: stdenv.mkDerivation rec { pname = "progress"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1ec6864fe6c..9159de9fd8c 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }: +{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkg-config, readline, postgresql }: stdenv.mkDerivation rec { pname = "pspg"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnugrep ncurses readline postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 185f0ca2816..7fc578ec857 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { name = "qjoypad-4.1.0"; src = fetchurl { url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst qt4 ]; NIX_LDFLAGS = "-lX11"; patchPhase = '' diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index ca8fe489c16..c60dd9f7c7a 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-1.10.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; preBuild = '' diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 0d0095645af..09ebbe33a34 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -9,7 +9,7 @@ , libelf , makeWrapper , pango -, pkgconfig +, pkg-config , polkit , python3 , scons @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { CFLAGS="-I${lib.getDev util-linux}/include"; nativeBuildInputs = [ - pkgconfig + pkg-config sphinx gettext scons diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 3e1e504e107..a75b90d6f54 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cryptopp +{ lib, stdenv, fetchurl, pkg-config, cryptopp , libusb1, qtbase, qttools, makeWrapper , qmake, withEspeak ? false, espeak ? null , qt5 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cryptopp libusb1 qtbase qttools ] ++ lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ makeWrapper pkg-config qmake qt5.wrapQtAppsHook ]; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 63c0f90079b..9d95085296f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -6,7 +6,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , cargo , rustc , gobject-introspection @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which autoconf automake diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 90d1e02b0df..225ed2e7824 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, lib, stdenv, gettext, perl, pkg-config, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] ++ lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix index 487307d3224..d42909a5c77 100644 --- a/pkgs/tools/misc/sd-mux-ctrl/default.nix +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: +{ lib, stdenv, fetchgit, cmake, pkg-config, libftdi1, popt}: stdenv.mkDerivation rec { pname = "sd-mux-ctrl-unstable"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libftdi1 popt ]; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 56c9541c2e0..1ff73492401 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , llvmPackages , expat @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ]; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isLinux [ python3 ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 158c62e60e9..a4a65e37e4e 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu , cppcheck }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] ++ lib.optional doCheck cppcheck; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index c249419d589..5dfe76d7ebb 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 +, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests , ncurses }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config docbook_xsl libxslt docbook_xml_dtd_45 ]; buildInputs = [ diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index 86b2941eed1..b9698e1e536 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { pname = "subberthehut"; version = "20"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xmlrpc_c glib zlib ]; installPhase = '' diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 08496bc1185..1781187481f 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool pkgconfig + intltool pkg-config xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython wrapGAppsHook autoreconfHook diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index d7d699d2ba4..e898ded8154 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "systrayhelper"; @@ -24,7 +24,7 @@ buildGoPackage rec { -w '' ]; - nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; + nativeBuildInputs = [ pkg-config libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index a9afcfd4091..84bfdc55d7f 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -1,4 +1,4 @@ -{ pkgconfig, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: +{ pkg-config, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "tensorman"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index c6c4886a3b4..63c4fd36ff6 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkg-config }: stdenv.mkDerivation { name = "timidity-2.15.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./timidity-iA-Oj.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libjack2 ncurses ]; configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index e4f43b5007c..25eee1c7b83 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config }: stdenv.mkDerivation rec { pname = "tldr"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ curl libzip ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 5f1b8d23646..d43d94cc8ed 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; meta = with lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 32d27da67d4..4e5ca70b955 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , makeWrapper , bison , ncurses @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook bison ]; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 3dba479f039..41eaa6b03bf 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libcaca }: +{ lib, stdenv, fetchurl, pkg-config, libcaca }: stdenv.mkDerivation rec { pname = "toilet"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libcaca ]; meta = with lib; { diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 1e73f716a7a..9e88e5da4f8 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchurl, pkgconfig, autoreconfHook + stdenv, lib, fetchurl, pkg-config, autoreconfHook , freetype, harfbuzz, libiconv, qtbase , enableGUI ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "macx-g++" "macx-clang" ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index dd7b1fae862..5e541345410 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, perl, pkgconfig +, cmake, perl, pkg-config , openssl, curl, libusb1, protobufc , enableUnsafe ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4"; }; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ cmake perl pkg-config ]; buildInputs = [ openssl curl libusb1 protobufc ]; cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ]; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index bc253a1d23b..4d78e7f3f93 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "tty-clock"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 923f6e7a3a4..990547291f6 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }: +, qmake, qtbase, pkg-config, taglib, libbass, libbass_fx }: # TODO: get rid of (unfree) libbass # issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3 @@ -33,7 +33,7 @@ mkDerivation { cd src ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase taglib libbass libbass_fx ]; meta = with lib; { diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 64221a92139..f69955020c7 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins +{ lib, mkDerivation, fetchFromGitHub, pkg-config, symlinkJoin, qmake, diffPlugins , qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }: let @@ -109,7 +109,7 @@ in mkDerivation { make install ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; inherit buildInputs; meta = with lib; { diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 95c2cbb7625..464183cf579 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xlibsWrapper, libev, libXi, libXfixes, - pkgconfig, asciidoc, libxslt, docbook_xsl }: + pkg-config, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "unclutter-xfixes"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "148m4wx8v57s3l2wb69y9imb00y8ca2li27hsxibwnl1wrkb7z4b"; }; - nativeBuildInputs = [ pkgconfig asciidoc libxslt docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ xlibsWrapper libev libXi libXfixes ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index d6be71c63b2..d75d462fc8e 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison +{ lib, stdenv, autoconf, automake, pkg-config, gettext, libtool, bison , flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline , python3 , svfSupport ? true @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext autoconf automake libtool bison flex which subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 68d972e5968..d001db4d3cb 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1, libimobiledevice }: stdenv.mkDerivation rec { pname = "usbmuxd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a2xgrb4b3ndam448z74wh1267nmrz1wcbpx4xz86pwbdc93snab"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libimobiledevice libusb1 ]; preConfigure = '' diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 1a3afb0d65f..d5f09d9f9fa 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # The wrapping is required so that the "sh-c" option of websocat works even diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 3904a1a03bc..676ff03ad9b 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d"; }; - nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ wayland ]; meta = with lib; { diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix index 5f0fec9fe61..85011baacae 100644 --- a/pkgs/tools/misc/wlr-randr/default.nix +++ b/pkgs/tools/misc/wlr-randr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; }; - nativeBuildInputs = [ meson ninja cmake pkgconfig ]; + nativeBuildInputs = [ meson ninja cmake pkg-config ]; buildInputs = [ wayland ]; meta = with lib; { diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 36ad53e00d0..32cdeaa2886 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf +{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkg-config, libgsf , libxml2, bzip2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index bf91e966239..f3fdc7e2227 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig +{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkg-config , gccCross ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ lib.optional (gccCross != null) gccCross; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index 8b9b30d56d4..7569045fa4f 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { pname = "xiccd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "159fyz5535lcabi5bzmxgmjdgxlqcjaiqgzr00mi3ax0i5fdldwn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libX11 libXrandr glib colord ]; meta = with lib; { diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index b28b5397e62..84d4833d63e 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook , gtk3, hicolor-icon-theme, netpbm }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 hicolor-icon-theme ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook ]; postPatch = '' sed -i src/file.c -e '21i#include ' diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 188b7fa6b28..827eaec048f 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC +{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC , withApplePCSC ? stdenv.isDarwin }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl check ] ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 99187ef548f..6934791da8e 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick +{ lib, stdenv, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick , libyubikey, yubikey-personalization }: mkDerivation rec { @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake imagemagick ]; + nativeBuildInputs = [ pkg-config qmake imagemagick ]; buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 1830af6a9bc..59739e06aa0 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libusb1, libyubikey, json_c }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libyubikey json_c ]; configureFlags = [ diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index d4d4e34aff0..c669a3a3be2 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -3,7 +3,7 @@ , apple_sdk ? null , libbsd , libressl -, pkgconfig +, pkg-config }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0gmdvmyw8a61w08hrxllypf7rpnqg0fxipbk3zmvsxj7m5i6iysj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 9728a20bd5c..eda64978c63 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools -, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper +, iw, ethtool, pciutils, libnl, pkg-config, makeWrapper , autoreconfHook, usbutils }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg"; }; - nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 055fc5267c3..6f3f95714a2 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 6da6f927eca..ead19b17926 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkgconfig, perl }: +{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkg-config, perl }: stdenv.mkDerivation rec { pname = "argus-clients"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-perl=${perl}/bin/perl" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; meta = with lib; { diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 935c1e926e6..bbb9d220144 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, - pkgconfig, procps, which, wget, lsof, net-snmp, perl }: + pkg-config, procps, which, wget, lsof, net-snmp, perl }: stdenv.mkDerivation rec { pname = "argus"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; - nativeBuildInputs = [ pkgconfig bison flex ]; + nativeBuildInputs = [ pkg-config bison flex ]; buildInputs = [ libpcap cyrus_sasl tcp_wrappers ]; propagatedBuildInputs = [ procps which wget lsof net-snmp ]; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 7357d4873d8..7e4f06302f2 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ]; + nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 333009226c1..f7e761ac0fd 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive -, pkgconfig, gettext, libssl, txt2man }: +, pkg-config, gettext, libssl, txt2man }: stdenv.mkDerivation rec { pname = "axel"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; + nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ]; buildInputs = [ gettext libssl ]; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index e277f7fd6af..b8fd0679892 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: +{lib, stdenv, fetchurl, which, autoreconfHook, pkg-config, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { version = "6.1.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm"; }; - nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; + nativeBuildInputs = [ pkg-config which autoreconfHook vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; configureFlags = [ "--enable-server" ]; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index e17c6c75eab..333a28dd390 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr +{ lib, stdenv, fetchurl, pkg-config, libcap, readline, texinfo, nss, nspr , libseccomp, pps-tools, gnutls }: assert stdenv.isLinux -> libcap != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline texinfo nss nspr gnutls ] ++ lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index 03606aabfe3..c75254a27b1 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkg-config, gtk3, connman, openconnect, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { autoconf automake intltool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 22cb9ccab88..976708c038c 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkg-config, dbus, json_c, ncurses, connman }: stdenv.mkDerivation { pname = "connman-ncurses"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus ncurses json_c connman ]; diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 3dc589eaf2c..21fa038707c 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , file , glib # always required runtime dependencies @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config file ] ++ optionals (enablePolkit) [ polkit ] diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 60ff5cf0e7c..d9f36845559 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: +{ lib, stdenv, fetchurl, cmake, pkg-config, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { version = "0.7.6"; pname = "davix"; - nativeBuildInputs = [ cmake pkgconfig python3 ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; # using the url below since the github release page states diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index bc854dfd0d5..d980d570226 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname, extraTags ? [] }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency @@ -28,7 +28,7 @@ in buildGoPackage rec { goPackagePath = "github.com/${owner}/${repo}"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ systemd ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 085227a5212..5bc56b9e03e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage, +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, udev, runtimeShellPackage, runtimeShell }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gf1qif25wy5lffzw39pi4sshmpxz1f4a1m9sglj7am1gaix3817"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index fdab2ff3003..88d753baf5b 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent }: stdenv.mkDerivation rec { pname = "dnscrypt-wrapper"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libsodium libevent ]; meta = with lib; { diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 8d6ed130a83..b8b88e19395 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch , libidn, libnetfilter_conntrack }: with lib; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { END ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ]; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 5aba2af865f..e4405670363 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config , openssl, ldns }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 7a5ceda9669..a9f9305169c 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng , giflib, glib, gtk2, cairo, pango, gdk-pixbuf, atk -, pkgconfig, autoreconfHook }: +, pkg-config, autoreconfHook }: with lib; @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "driftnet"; version = "1.1.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libjpeg libungif libpng giflib glib gtk2 glib cairo pango gdk-pixbuf atk autoreconfHook diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index d57d9fc635b..ed7bb0b01d3 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkg-config , libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw"; }; - nativeBuildInputs = [ pkgconfig bison meson ninja ]; + nativeBuildInputs = [ pkg-config bison meson ninja ]; buildInputs = [ libuecc libsodium libcap json_c openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 34480cf68c5..b228967a73b 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sed -i -e '//d' lib/pty.c ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 readline ncurses gettext openssl ]; meta = { diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 843c53a7ad5..acaeb3bc4cc 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, makeWrapper, gstreamer +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, makeWrapper, gstreamer , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: let @@ -28,7 +28,7 @@ in ]; buildInputs = [ gstreamer libupnp ]; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; postInstall = '' for prog in "$out/bin/"*; do diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index ee625b36ed8..655cf118302 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -4,7 +4,7 @@ , ninja , gupnp , gssdp -, pkgconfig +, pkg-config , gtk3 , libuuid , gettext @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 66cb883f5aa..194365130bf 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }: +{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: stdenv.mkDerivation rec { pname = "horst"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses libnl ]; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 3932bbd08cf..cea92661f32 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform -, openssl, pkgconfig, darwin, libiconv }: +, openssl, pkg-config, darwin, libiconv }: rustPlatform.buildRustPackage rec { pname = "httplz"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index d9300381bdb..5007a69fb9b 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libdnet, pkgconfig, libpcap}: +{lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}: stdenv.mkDerivation { name = "hyenae-0.36-1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdnet libpcap]; meta = { diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 2cb04c1b210..47d86615026 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gnutls libite libconfuse ]; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 4998eb1eb91..992ee324cc5 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libyamlcpp, systemd , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl , libxml2, docbook5 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl + meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout systemd ]; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index c3b5d1a84f8..e311fef339f 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: +{ fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }: stdenv.mkDerivation { name = "jnettop-0.13.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ libpcap ncurses glib ]; patches = [ diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 218878a978e..58b35f2f53f 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libpcap, guile, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31"; }; buildInputs = [ libpcap guile openssl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "GUILELIBDIR=\${out}/share/guile/site" "GUILECACHEDIR=\${out}/lib/guile/ccache" diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 604a30a0ba7..7ce5e0ccbf0 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, nixosTests , libnfnetlink, libnl, net-snmp, openssl -, pkgconfig, autoreconfHook }: +, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "keepalived"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { passthru.tests.keepalived = nixosTests.keepalived; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; configureFlags = [ "--enable-sha1" diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 76a93844b0a..f51c6f034dd 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: +{ lib, stdenv, fetchurl, gnutls, pkg-config, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { pname = "lftp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index aff451ab44a..a2cf239b56b 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }: +{ lib, stdenv, fetchzip, libpcap, glib, pkg-config, libnet }: stdenv.mkDerivation { pname = "libnids"; version = "1.24"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/libnids/libnids-1.24.tar.gz"; sha256 = "1cblklfdfxcmy0an6xyyzx4l877xdawhjd28daqfsvrh81mb07k1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap glib libnet ]; /* diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index f787329e37a..3546e1aa119 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, - pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, + pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python, docs ? false, xmlto, libselinux, ldns }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "-DNSS_PKCS11_2_0_COMPAT=1" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ldns ] ++ lib.optional docs xmlto diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 229f261c8c3..18ae090f211 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo +{ stdenv, lib, fetchurl, pkg-config, removeReferencesTo , libevent, readline, net-snmp, openssl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=\${out}/lib/systemd/system" ]; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ libevent readline net-snmp openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index d9fb58685b6..b258c638df5 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, pcre, perl }: +{ fetchurl, lib, stdenv, pkg-config, pcre, perl }: stdenv.mkDerivation { name = "maildrop-2.6.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre perl ]; patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 0cc289d0149..4194605df53 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkg-config , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools , python3, gss, libmysqlclient, system-sendmail }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook gettext pkgconfig + autoreconfHook gettext pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 38ac35c342d..c4e16ef8b1c 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glibc +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc , bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ bison curl flex gperftools jansson jemalloc kerberos lua libmysqlclient diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index f623d7cde76..0fe128ad13c 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, libevent, pcre, zlib, openssl +, pkg-config, libevent, pcre, zlib, openssl }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace '1.2.8' '${version}' ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent pcre zlib openssl ]; meta = { diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index fe15d8bd328..9642f254838 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, iptables, libuuid, pkgconfig +{ stdenv, lib, fetchurl, iptables, libuuid, pkg-config , which, iproute, gnused, coreutils, gawk, makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ iptables libuuid ]; - nativeBuildInputs= [ pkgconfig makeWrapper ]; + nativeBuildInputs= [ pkg-config makeWrapper ]; makefile = "Makefile.linux"; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index ccc99457d9b..f102995a3cc 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , glib , dbus }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 248cd59fe12..ec74d1a47a0 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig +{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkg-config , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15cjy7zzsxagx649vz0990avin47vpgdmm4ss2msggdla6x2c6py"; }; - nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 6f57cf9c8e1..4294e9a7778 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion , libutempter ? null, withUtempter ? stdenv.isLinux }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf ncurses zlib makeWrapper openssl bash-completion ] ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 7cb381e0de7..03e19d5cb7a 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe +{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu , withMug ? false @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) guile ++ lib.optionals withMug [ gtk3 webkitgtk ]; - nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; + nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index cf5c304a8a6..c136328d031 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, which }: +{ lib, stdenv, fetchurl, pkg-config, glib, which }: stdenv.mkDerivation rec { name = "nbd-3.20"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ] ++ lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; postInstall = '' mkdir -p "$out/share/doc/${name}" diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 08023367edf..651cbab86d9 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkg-config }: with lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] ++ optional stdenv.isLinux systemd; diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 6252d776886..d7dd99b58fa 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, dbus-glib +{ lib, stdenv, fetchurl, intltool, pkg-config, dbus-glib , udev, libnl, libuuid, gnutls, dhcp , libgcrypt, perl, libgudev, avahi, ppp, kmod }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus-glib ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; patches = [ ./libnl-3.2.25.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 4a7e4a937c4..88e50579dcc 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, intltool, pkgconfig, fetchpatch, dbus +{ lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gnutls libgcrypt ]; nativeBuildInputs = [ - meson ninja intltool pkgconfig + meson ninja intltool pkg-config vala gobject-introspection dbus # Docs gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 635d1645a14..87069d3c3c8 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 +{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 , withGnome ? true, gnome3, fetchpatch, libnma, glib }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation { buildInputs = [ iodine networkmanager glib ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; + nativeBuildInputs = [ intltool autoreconfHook pkg-config ]; # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index f7d3f1da8dc..bfcc2d8ae86 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, libnma }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager ppp ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; + nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ]; preConfigure = '' intltoolize -f diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index c91a2aab610..462eb3793d8 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -5,7 +5,7 @@ , libxml2 , openconnect , intltool -, pkgconfig +, pkg-config , autoreconfHook , networkmanager , gcr @@ -55,7 +55,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool - pkgconfig + pkg-config file ]; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 8c1c4a85f26..4a9e508fcdc 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret +{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret , gtk3, withGnome ? true, gnome3, kmod, libnma }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation { buildInputs = [ openvpn networkmanager ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; + nativeBuildInputs = [ intltool pkg-config file libxml2 ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/network-manager/sstp/default.nix index dc5f7e8adac..d00c0e3e55f 100644 --- a/pkgs/tools/networking/network-manager/sstp/default.nix +++ b/pkgs/tools/networking/network-manager/sstp/default.nix @@ -10,7 +10,7 @@ , libnma , libsecret , networkmanager -, pkgconfig +, pkg-config , ppp , sstp , substituteAll @@ -32,7 +32,7 @@ in stdenv.mkDerivation { buildInputs = [ sstp networkmanager glib ppp ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ]; + nativeBuildInputs = [ file intltool autoreconfHook pkg-config ]; postPatch = '' sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 6f37ca296bb..c4cb79b4c8c 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM +{ lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM , gtk3, gnome3, libsecret, libnma }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index ec9f60e0886..6ac71efc260 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret +{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret , gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { buildInputs = [ vpnc networkmanager glib ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool pkgconfig file ]; + nativeBuildInputs = [ intltool pkg-config file ]; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 9f2c071c408..e112b8c1df1 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, makeWrapper, autoreconfHook +, pkg-config, makeWrapper, autoreconfHook , openldap, python, pam }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh"; }; - nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ openldap pam python ]; preConfigure = '' diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 910d800f08c..2ba373a2c61 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib , geoip, geolite-legacy, sqlite, which, autoreconfHook, git -, pkgconfig, groff, curl, json_c, luajit, zeromq, rrdtool +, pkg-config, groff, curl, json_c, luajit, zeromq, rrdtool }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy - sqlite which autoreconfHook git pkgconfig groff curl json_c luajit zeromq + sqlite which autoreconfHook git pkg-config groff curl json_c luajit zeromq rrdtool ]; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 224474f1b38..375896258bc 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 +{ lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2 , gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt zlib openssl ]; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 846ebe0a143..2f5dd14757b 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, nettle, gnutls +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, nettle, gnutls , libev, protobufc, guile, geoip, libseccomp, gperf, readline , lz4, libgssglue, ronn, pam }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp gperf readline lz4 libgssglue ronn pam ]; meta = with lib; { diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 5dafb1e5639..8113f842438 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , glib , dbus , ell @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index c41ef54530f..da4dab4980c 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } : +{ lib, stdenv, fetchurl, pkg-config, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } : assert (openssl != null) == (gnutls == null); @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 3bbc474aa60..3ca47897618 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : +{ lib, stdenv, fetchFromGitHub, pkg-config, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : assert (openssl != null) == (gnutls == null); @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; preConfigure = '' - export PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config + export PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" ''; @@ -27,7 +27,7 @@ stdenv.mkDerivation { "--without-openssl-version-check" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; meta = with lib; { diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 56ae2590576..6b132fd4b0b 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , openssl, ppp , systemd ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)$(confdir)' /tmp ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl ppp diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 18c185ffcce..17a227c496a 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,7 +5,7 @@ , zlib , openssl , libedit -, pkgconfig +, pkg-config , pam , autoreconfHook , etcDir ? null @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook ++ optional withKerberos pkgs.kerberos.dev; buildInputs = [ zlib openssl libedit pam ] @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { # Upstream build system does not support static build, so we fall back # on fragile patching of configure script. # - # libedit is found by pkgconfig, but without --static flag, required + # libedit is found by pkg-config, but without --static flag, required # to get also transitive dependencies for static linkage, hence sed # expression. # diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 6ecc9f7ba12..4ab93b7574a 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -3,7 +3,7 @@ , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui , fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, autoreconfHook, pkgconfig, makeWrapper, libX11 ? null }: +, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }: assert httpServer -> libpng != null; assert client -> libX11 != null; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { popd >/dev/null ''; - nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkg-config ]; buildInputs = [ zlib wxGTK perl cryptopp libupnp diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 4a3144c7da1..0c0bc370526 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , bison -, pkgconfig +, pkg-config , gettext , desktop-file-utils , glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { bison desktop-file-utils gettext - pkgconfig + pkg-config ]; buildInputs = [ glib diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index cbb1ae03113..4d3ccf5fc15 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,6 +1,6 @@ # NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent # This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , cppunit, openssl, libsigcxx, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ cppunit openssl libsigcxx zlib ]; meta = with lib; { diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 90dec70ec46..20f9cec6f5f 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config , libtool, autoconf, automake, cppunit , libtorrent, ncurses, libsigcxx, curl , zlib, openssl, xmlrpc_c @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool autoconf automake cppunit libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index a7405abacb4..dfaad9c1e97 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libsoup, meson, ninja }: +, pkg-config, libsoup, meson, ninja }: let version = "2.5"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { "-Dudev=disabled" ]; - nativeBuildInputs = [ libsoup pkgconfig meson ninja ]; + nativeBuildInputs = [ libsoup pkg-config meson ninja ]; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 16a4dfada91..9cb8c0b88f7 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , libtool , libpcap @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "17p5isrq5w58hvmzhc6akbd37ins3c95g0rvhhdm0v33khzxmran"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ libpcap ] ++ optional withJansson jansson ++ optional withNflog libnetfilter_log diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 116b1de83ec..6a4c8a3d4f6 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: +{ lib, stdenv, fetchurl, pkg-config, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { pname = "radvd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; }; - nativeBuildInputs = [ pkgconfig bison flex check ]; + nativeBuildInputs = [ pkg-config bison flex check ]; buildInputs = [ libdaemon ]; meta = with lib; { diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index b697f4c3b3d..e772a74f099 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , wafHook , python3 , asciidoc @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config wafHook python3 asciidoc diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 8b159bc0b7b..06d081b745c 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium, Security }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl libsodium ] ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index ec57e851f4b..452718ebc9c 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }: +{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkg-config }: rustPlatform.buildRustPackage rec { pname = "sniffglue"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "01ya9535whi2kviw57f25n8h05ckpb4bq1h7qav6srai97rm937s"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libseccomp ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index b3686580907..23b3f2688c9 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute +{ lib, stdenv, fetchurl, pkg-config, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: let inherit (lib) optional; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf libpcap traceroute ] ++ optional withGUI qt5.qtbase ; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index d9ae9327344..97e35949b15 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: +{ lib, stdenv, fetchurl, pkg-config, ppp, libevent, openssl }: stdenv.mkDerivation rec { pname = "sstp-client"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl ppp ]; meta = { diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 69a2f98832e..67df00b8e69 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv , systemd, pam @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index 0873b9a541a..190950e37ec 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { pname = "tinyfecvpn"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patchPhase = '' runHook prePatch diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index d3415a88b86..01eced9a566 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, arpa2cm +, cmake, pkg-config, arpa2cm , openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh , softhsm }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - cmake pkgconfig arpa2cm + cmake pkg-config arpa2cm ]; buildInputs = [ diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index be949d60067..85fcea008de 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, rustPlatform, fetchFromGitHub , libsodium, openssl -, pkgconfig +, pkg-config }: with rustPlatform; @@ -17,7 +17,7 @@ buildRustPackage rec { }; buildInputs = [ libsodium openssl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; SODIUM_USE_PKG_CONFIG = "yes"; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 3e90f240641..69bc3fc409b 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildGoPackage, fetchgit -, pkgconfig +, pkg-config , glib, libxml2 }: @@ -18,7 +18,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 ]; meta = { diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 133d166fdb4..2bece5e30dd 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, +{ lib, stdenv, fetchurl, pkg-config, intltool, openssl, curl, libnotify, libappindicator-gtk3, gst_all_1, gtk3, dconf, wrapGAppsHook, aria2 ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool wrapGAppsHook ]; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index ce4fe2d1418..3ac71ca37e5 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, pkgconfig, perlPackages +{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl , python3, lzip , libpsl ? null @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ gettext pkgconfig perlPackages.perl lzip libiconv libintl ]; + nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ]; buildInputs = [ libidn2 zlib pcre libuuid ] ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] ++ lib.optional (openssl != null) openssl diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index e2dd3a4c4fd..f8613beb936 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: +{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.5.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d"; }; - nativeBuildInputs = [ perl gettext pkgconfig ]; + nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; preConfigure = '' diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 6451c52d1da..0488fb9fa18 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, jansson }: stdenv.mkDerivation rec { name = "xnbd-0.4.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-build-for-glibc-2.28.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib jansson ]; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 9acf9ed11c5..b495a302618 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index eb31bf0cdeb..da461a96957 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -6,7 +6,7 @@ , gettext , flex , perl -, pkgconfig +, pkg-config , pcsclite , libusb1 , libiconv @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoconf automake libtool diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index b2c1618ed79..b88da7599d1 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, afl, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkgconfig flex bison autoconf texinfo + python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 74e081b95a3..0a98f27182b 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkgconfig flex bison autoconf texinfo + python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index de84e43b5aa..e6672e1b3d9 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, lib, stdenv, libiconv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, stdenv, libiconv }: buildGoPackage rec { pname = "aws-okta"; @@ -17,7 +17,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libiconv ]; meta = with lib; { diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index d2321523b32..3b623cefd0d 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests -, pkgconfig, openssl +, pkg-config, openssl , Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 1be561dae54..b20b513ac28 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: +{ lib, stdenv, fetchurl, pcsclite, pkg-config, libusb1, perl }: stdenv.mkDerivation rec { pname = "ccid"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ pcsclite libusb1 ]; meta = with lib; { diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index 0200fca8ff3..2f89c3ea585 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip -, scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam +, scons, pkg-config, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }: let @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { substituteInPlace makefile --replace @@NIXOS_LEVELDB@@ ${leveldb} ''; - nativeBuildInputs = [ unzip scons pkgconfig ]; + nativeBuildInputs = [ unzip scons pkg-config ]; buildInputs = [ trousers glib dbus_cplusplus dbus protobuf openssl snappy leveldb pam ]; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 134f916f043..4966c6412ab 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: mkDerivation rec { pname = "chrome-token-signing"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln"; }; - buildInputs = [ qmake pcsclite pkgconfig ]; + buildInputs = [ qmake pcsclite pkg-config ]; dontUseQmakeConfigure = true; patchPhase = '' diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 0b8f50c1190..36b5ab47304 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, asciidoc , jansson, jose, cryptsetup, curl, libpwquality, luksmeta }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz"; }; - nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; + nativeBuildInputs = [ meson ninja pkg-config asciidoc ]; buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 33a219e8621..748bfdcb2ca 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake openssl libgsf gmp ]; installPhase = diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index adf1a74f42a..6c126673259 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; }; - nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; + nativeBuildInputs = with pkgs; [ cmake pkg-config doxygen ]; buildInputs = with pkgs; [ libuecc ]; meta = with lib; { diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index a49c6713e09..569b83feb9a 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false +{ lib, stdenv, fetchurl, pkg-config, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 116add24314..cbe56694da1 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , gtk3, nssTools, pcsclite , libxml2, libproxy , openssl, curl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "Fedict"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; preConfigure = '' mkdir openssl diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 1837fc6d850..0ca45957d69 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnupg, gtk2 +{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk2 , libxml2, intltool }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 14a9427b0f1..72c0bc204f8 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , perl @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja perl diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index a41c995ab40..d19f07595e8 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs , glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index eb0553ed083..c8accce7d40 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libgpgerror, libassuan, libgcrypt, pkcs11helper, - pkgconfig, openssl }: + pkg-config, openssl }: stdenv.mkDerivation rec { pname = "gnupg-pkcs11-scd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mfh9zjbahjd788rq1mzx009pd7p1sq62sbz586rd7szif7pkpgx"; }; - buildInputs = [ pkcs11helper pkgconfig openssl ]; + buildInputs = [ pkcs11helper pkg-config openssl ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 8dd0c779c3b..90ae4300fa6 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba , libgpgerror, libiconv, npth, gettext, texinfo, buildPackages # Each of the dependencies below are optional. @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext readline libusb1 gnutls adns openldap zlib bzip2 sqlite diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 648774c5867..34c140023ac 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , pkgconfig +{ lib, stdenv, fetchFromGitHub , pkg-config , pcsclite , autoreconfHook , libnfc @@ -14,7 +14,7 @@ stdenv.mkDerivation { rev = "0e48e8e"; sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ pcsclite libnfc ]; configureFlags = [ "--prefix=$(out)" ]; diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index 73eab6c3dec..4c276cb6e90 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, pkgconfig, pcsclite }: +{ lib, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }: buildGoPackage rec { pname = "keycard-cli"; @@ -7,7 +7,7 @@ buildGoPackage rec { goPackagePath = "github.com/status-im/keycard-cli"; subPackages = [ "." ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite ]; src = fetchFromGitHub { diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index d03de5f7cfc..c1849bdca39 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig +{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkg-config , kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { makeFlags = [ "KDE_VER=5" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; # if using just kwallet, cmake will be added as a buildInput and fail the build propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ]; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 7ec902bcb99..8d2074f9835 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig +{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkg-config , bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; }; - nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; + nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ]; buildInputs = [ bash-completion curl openssl libxml2 libxslt diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 126cfedd157..a2fe22dd2bd 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, pkg-config, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 5735263206e..2222316a742 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , doxygen, perl, valgrind , curl, geoip, libxml2, lmdb, lua, pcre, yajl }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl valgrind curl geoip libxml2 lmdb lua pcre yajl ]; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 006e89871c7..3128a787807 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnfc }: +{ lib, stdenv, fetchurl, pkg-config, libnfc }: stdenv.mkDerivation { pname = "mfcuk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnfc ]; meta = with lib; { diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 1d2478b6bae..ca1f4a5e4f2 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libnfc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libnfc }: stdenv.mkDerivation rec { pname = "mfoc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnfc ]; meta = with lib; { diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 878d47f8adf..1bbefd1342c 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , curl, apacheHttpd, pcre, apr, aprutil, libxml2 , luaSupport ? false, lua5 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++ optional luaSupport lua5; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 93c12c15828..e39be14475e 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -6,7 +6,7 @@ , boost , curl , gettext -, pkgconfig +, pkg-config , libusb1 , gnutls }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake gettext pkgconfig ]; + nativeBuildInputs = [ cmake gettext pkg-config ]; buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1da54526a61..c3aebc782d8 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig +{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config , qtbase, qttranslations, qtsvg, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake - pkgconfig + pkg-config wrapQtAppsHook ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index e0a4f8a08fc..531eb6eae4a 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 +{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3 , pcre, liblinear, libssh2 , graphicalSupport ? false , libX11 ? null @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pygtk pysqlite pygobject2 pycairo ]; - nativeBuildInputs = [ pkgconfig ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [ python2 libX11 gtk2 ]); diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 39026c400d0..b4e406a0035 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , wrapQtAppsHook , dnsutils , nmap @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtscript qtwebengine ]; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index deab1b929c9..d48564ce95b 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which +{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkg-config, which , libnl, protobuf, protobufc, shadow }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh"; }; - nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ]; buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index 53d8abc6100..d87be0c2974 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkg-config }: stdenv.mkDerivation rec { version = "0.28"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; }; - nativeBuildInputs = [ automake autoconf pkgconfig ]; + nativeBuildInputs = [ automake autoconf pkg-config ]; buildInputs = [ ncurses parted ]; preConfigure = "sh init.sh || :"; meta = with lib; { diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 5fb7fadbc5c..ba49da102fb 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkg-config, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: let securityDependency = @@ -26,7 +26,7 @@ in stdenv.mkDerivation { buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; - nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkg-config ]; # man file generation fails when true enableParallelBuilding = false; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 8201b809d15..51e0c1f58f9 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 65446e6fc44..40736cdc86b 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libusb1, pcsclite }: let version = "3.99.5"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "tools" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 pcsclite ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index da8fa96d10d..1d874a16da6 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, dbus, perl, python3 +{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3 , IOKit ? null }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { moveToOutput bin/pcsc-spy "$dev" ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index b2ef4e7e030..613388fc6a3 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite +{ stdenv, lib, fetchurl, makeWrapper, pkg-config, udev, dbus, pcsclite , wget, coreutils, perlPackages }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { buildInputs = [ udev dbus perlPackages.perl pcsclite ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; postInstall = '' wrapProgram $out/bin/scriptor \ diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 444dd3679f3..909bbbaed16 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook, wrapGAppsHook +{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null @@ -48,7 +48,7 @@ pinentryMkDerivation rec { sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; buildInputs = [ libgpgerror libassuan libcap libsecret ] ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index bd8be01c697..c4c9e9929d5 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: +{ lib, stdenv, fetchurl, polkit, gtk3, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "polkit-gnome"; version = "0.105"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ polkit gtk3 ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; configureFlags = [ "--disable-introspection" ]; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 4cc831eda39..3b1f21ac718 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, pcsclite, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, pcsclite, qt5 , gcc-arm-embedded }: let @@ -12,7 +12,7 @@ let inherit rev sha256; }; - nativeBuildInputs = [ pkgconfig gcc-arm-embedded ]; + nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; postPatch = '' diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 51ddad0634f..2b769ee0a15 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14"; }; - nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ]; postPatch = '' substituteInPlace client/CMakeLists.txt \ diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index bd5e8866374..6ea2f45b806 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -4,7 +4,7 @@ , fetchCrate , pinentry , openssl -, pkgconfig +, pkg-config , makeWrapper , Security @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007"; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 268641cb3cb..4cdc3f6d89e 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: with rustPlatform; buildRustPackage rec { @@ -18,7 +18,7 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig gpgme python3 ]; + nativeBuildInputs = [ pkg-config gpgme python3 ]; buildInputs = [ ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 2b35ec94e6e..617224a6af3 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkg-config , sysfsutils , argp-standalone # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''} ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; configureFlags = [ (withFeature withGcrypt "libgcrypt") diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 36e75094c59..7a0bb37d4a4 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchgit, autoconf, automake, pkgconfig, help2man +, fetchgit, autoconf, automake, pkg-config, help2man , openssl, libuuid, gnu-efi, libbfd }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - nativeBuildInputs = [ autoconf automake pkgconfig help2man ]; + nativeBuildInputs = [ autoconf automake pkg-config help2man ]; buildInputs = [ openssl libuuid libbfd gnu-efi ]; configurePhase = '' diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 1b59db540a2..c83a6f157c8 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libbsd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libbsd, pkg-config }: stdenv.mkDerivation rec { pname = "signify"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd ]; preInstall = '' diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index ef2f97cfa11..7cc343b7823 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkg-config }: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libseccomp sqlite ]; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 0c6699b439c..f5f733d70b9 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , libxml2, nettle , withGTK3 ? true, gtk3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoconf ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool libxml2 nettle diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 81086e77483..88ea30088f5 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql -, withGUI ? false, makeWrapper, pkgconfig, gtk2 }: +, withGUI ? false, makeWrapper, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "thc-hydra"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace "-lcurses" "-lncurses" ''; - nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; + nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ]; buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a96dae5f5ef..b4adbfe8c64 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks +{ lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks , libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests , writeShellScript @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index e6a7621d987..6b33d1d4d59 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib -, pandoc, pkgconfig, makeWrapper, curl, openssl, tpm2-tss +, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss , abrmdSupport ? true, tpm2-abrmd ? null }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0117r0zzdnblkibv81y71v3limixsw5m7g9xwf7lcx8fc8836pdv"; }; - nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; + nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; buildInputs = [ curl openssl tpm2-tss ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 76a3443d076..c7a11e16f39 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "trousers"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index 5860fb3a03e..d4f3e1567ca 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkgconfig, darwin }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkg-config, darwin }: buildGoModule rec { pname = "yubikey-agent"; @@ -15,7 +15,7 @@ buildGoModule rec { lib.optional stdenv.isLinux (lib.getDev pcsclite) ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC); - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; # pull in go-piv/piv-go#75 # once go-piv/piv-go#75 is merged and released, we should diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index fdcb5ed5ce9..0e37b725db4 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjson, json_c, gengetopt, flex, byacc, gmp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp , libpcap }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; dontUseCmakeBuildDir = true; - nativeBuildInputs = [ cmake pkgconfig gengetopt flex byacc ]; + nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ]; buildInputs = [ libjson json_c gmp libpcap ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index e7d12d8a68e..f8f7bece3a5 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "zzuf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; }; - buildInputs = [ autoconf automake libtool pkgconfig ]; + buildInputs = [ autoconf automake libtool pkg-config ]; preConfigure = "./bootstrap"; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 7f9be8bb616..18088eb6c30 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv -, libavc1394, pkgconfig, autoreconfHook }: +, libavc1394, pkg-config, autoreconfHook }: stdenv.mkDerivation { name = "dvgrab-2016-05-16"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 801d8c564c1..45f63dc7727 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkg-config, SDL, SDL_gfx , withMinimal ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 5439d64bbfd..c5e777f7531 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libxslt, freetype, libpng, libxml2 +, pkg-config, libxslt, freetype, libpng, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Fixes build with GCC 6 NIX_CFLAGS_COMPILE = "-std=c++03"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxslt freetype libpng libxml2 ]; meta = { diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 257f5bddb15..a7de9ae8b59 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, buildGoPackage, fetchFromGitHub +{ lib, stdenv, pkg-config, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: @@ -25,7 +25,7 @@ buildGoPackage rec { postInstall = '' wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} ''; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with lib; { description = "System container image builder for LXC and LXD"; From bd42003f87ec12fd8d99ff6907bd2ca68333e5a9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 12:49:22 +0700 Subject: [PATCH 33/38] pkgs/games: pkg-config -> pkgconfig (2) --- pkgs/games/0ad/game.nix | 4 ++-- pkgs/games/alienarena/default.nix | 4 ++-- pkgs/games/amoeba/default.nix | 4 ++-- pkgs/games/assaultcube/default.nix | 4 ++-- pkgs/games/btanks/default.nix | 4 ++-- pkgs/games/bzflag/default.nix | 4 ++-- pkgs/games/cataclysm-dda/common.nix | 4 ++-- pkgs/games/chessx/default.nix | 4 ++-- pkgs/games/commandergenius/default.nix | 4 ++-- pkgs/games/crawl/default.nix | 4 ++-- pkgs/games/crispy-doom/default.nix | 4 ++-- pkgs/games/dxx-rebirth/default.nix | 4 ++-- pkgs/games/easyrpg-player/default.nix | 4 ++-- pkgs/games/eboard/default.nix | 4 ++-- pkgs/games/eidolon/default.nix | 4 ++-- pkgs/games/extremetuxracer/default.nix | 4 ++-- pkgs/games/exult/default.nix | 4 ++-- pkgs/games/ezquake/default.nix | 4 ++-- pkgs/games/freecell-solver/default.nix | 4 ++-- pkgs/games/freeciv/default.nix | 4 ++-- pkgs/games/freedink/default.nix | 4 ++-- pkgs/games/freedroidrpg/default.nix | 4 ++-- pkgs/games/frogatto/engine.nix | 4 ++-- pkgs/games/frozen-bubble/default.nix | 4 ++-- pkgs/games/fsg/default.nix | 4 ++-- pkgs/games/gnubg/default.nix | 4 ++-- pkgs/games/gtetrinet/default.nix | 4 ++-- pkgs/games/gzdoom/default.nix | 6 +++--- pkgs/games/hedgewars/default.nix | 4 ++-- pkgs/games/instead/default.nix | 4 ++-- pkgs/games/ivan/default.nix | 4 ++-- pkgs/games/klavaro/default.nix | 4 ++-- pkgs/games/lgogdownloader/default.nix | 4 ++-- pkgs/games/lugaru/default.nix | 4 ++-- pkgs/games/macopix/default.nix | 4 ++-- pkgs/games/nethack/default.nix | 4 ++-- pkgs/games/odamex/default.nix | 4 ++-- pkgs/games/openclonk/default.nix | 4 ++-- pkgs/games/opendune/default.nix | 4 ++-- pkgs/games/openra/common.nix | 4 ++-- pkgs/games/openttd/default.nix | 4 ++-- pkgs/games/performous/default.nix | 4 ++-- pkgs/games/pingus/default.nix | 4 ++-- pkgs/games/pioneer/default.nix | 4 ++-- pkgs/games/qtads/default.nix | 4 ++-- pkgs/games/redeclipse/default.nix | 4 ++-- pkgs/games/rftg/default.nix | 4 ++-- pkgs/games/robotfindskitten/default.nix | 4 ++-- pkgs/games/scorched3d/default.nix | 4 ++-- pkgs/games/sgt-puzzles/default.nix | 4 ++-- pkgs/games/simutrans/default.nix | 4 ++-- pkgs/games/speed-dreams/default.nix | 4 ++-- pkgs/games/spring/springlobby.nix | 4 ++-- pkgs/games/supertux/default.nix | 4 ++-- pkgs/games/teeworlds/default.nix | 4 ++-- pkgs/games/tuxpaint/default.nix | 4 ++-- pkgs/games/tuxtype/default.nix | 4 ++-- pkgs/games/ultimatestunts/default.nix | 4 ++-- pkgs/games/ultrastardx/default.nix | 4 ++-- pkgs/games/uqm/default.nix | 4 ++-- pkgs/games/vdrift/default.nix | 4 ++-- pkgs/games/warmux/default.nix | 4 ++-- pkgs/games/warzone2100/default.nix | 4 ++-- pkgs/games/wesnoth/default.nix | 4 ++-- pkgs/games/wyvern/default.nix | 4 ++-- pkgs/games/xboard/default.nix | 4 ++-- pkgs/games/zandronum/default.nix | 4 ++-- pkgs/games/zaz/default.nix | 4 ++-- 68 files changed, 137 insertions(+), 137 deletions(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 558c69c14d6..f98fbdf298c 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,5 +1,5 @@ { stdenv, lib, perl, fetchurl, python2 -, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium +, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"; }; - nativeBuildInputs = [ python2 perl pkgconfig ]; + nativeBuildInputs = [ python2 perl pkg-config ]; buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 5e9fd54e4ff..84badc8d853 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg +{ lib, stdenv, fetchurl, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGL }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg libX11 curl libogg libvorbis freetype openal libGL libXxf86vm ]; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 071a81bcb92..d648ac85c60 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }: +{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i main/linux-config/linux-config.cpp -e 's|libgtk-x11-2.0.so.0|${gtk2}/lib/&|' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; installPhase = '' diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index a3284bb3ab6..0206821f387 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, makeDesktopItem, openal, pkgconfig, libogg, +{ fetchFromGitHub, lib, stdenv, makeDesktopItem, openal, pkg-config, libogg, libvorbis, SDL, SDL_image, makeWrapper, zlib, file, client ? true, server ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1vfn3d55vmmipdykrcfvgk6dddi9y95vlclsliirm7jdp20f15hd"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index cb6078026dc..202bab0df66 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGL, zlib, smpeg +{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkg-config, SDL, libGL, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 1ec24e02be0..dfddc2e859f 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , curl, SDL2, libGLU, libGL, glew, ncurses, c-ares , Carbon, CoreServices }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl SDL2 libGLU libGL glew ncurses c-ares ] ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ]; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 81df46d4314..d975a60c1fd 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, pkgconfig, gettext, ncurses, CoreFoundation +{ lib, stdenv, runtimeShell, pkg-config, gettext, ncurses, CoreFoundation , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa , debug , useXdgDir @@ -37,7 +37,7 @@ in stdenv.mkDerivation { pname = "cataclysm-dda"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = cursesDeps ++ optionals tiles tilesDeps; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 9f8e4c6cc5a..f63f6362558 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,6 +1,6 @@ { mkDerivation , lib, stdenv -, pkgconfig +, pkg-config , zlib , qtbase , qtsvg @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qmake ]; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index c375668c222..725cc5231c7 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkgconfig +{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkg-config , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export makeFlags="$makeFlags DESTDIR=$(out)" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(sdl2-config --cflags)" diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 353a7b029cf..ec8845b7869 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses +{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp , tileMode ? false, enableSound ? tileMode @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Patch hard-coded paths and remove force library builds patches = [ ./crawl_purify.patch ]; - nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; + nativeBuildInputs = [ pkg-config which perl pngcrush advancecomp ]; # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index f9e6acb44b0..2b04e31f548 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "crispy-doom"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done ''; - nativeBuildInputs = [ autoreconfHook pkgconfig python ]; + nativeBuildInputs = [ autoreconfHook pkg-config python ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 43c3fd00a02..c2e3fac7e15 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , scons -, pkgconfig +, pkg-config , SDL , SDL_mixer , libGLU @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sha256 = "1lsrlp47aby2m9hh7i3nv5rb0srlkmnq1w2ca6vyvlga9m9h7jrk"; }; - nativeBuildInputs = [ pkgconfig scons ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ libGLU libGL libpng physfs SDL SDL_mixer ]; diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 7ebba6c3d72..81968d25e3d 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkgconfig, freetype ? null, glib, harfbuzz ? null +{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config, freetype ? null, glib, harfbuzz ? null , liblcf, libpng, libsndfile ? null, libvorbis ? null, libxmp ? null , libXcursor, libXext, libXi, libXinerama, libXrandr, libXScrnSaver, libXxf86vm , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "103ywad12dcfjpf97kyx22smilqrw1f20xcfvjjr4mm3walc2mdp"; }; - nativeBuildInputs = [ cmake doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ freetype diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 57cd5b4176e..67d7d38018e 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, perl, pkg-config, gtk2 }: stdenv.mkDerivation { name = "eboard-1.1.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./eboard.patch ]; buildInputs = [ gtk2 ]; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index bb7f7a68bcf..3192976b0f6 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, rustPlatform, pkgconfig, openssl }: +{ lib, stdenv, fetchgit, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "eidolon"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1i8qfphynwi42pkhhgllxq42dnw9f0dd6f829z94a3g91czyqvsw"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 8ea19c93dfe..88d8598e133 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype , sfml, libXi , libXmu, libXext, libXt, libSM, libICE -, libpng, pkgconfig, gettext, intltool +, libpng, pkg-config, gettext, intltool }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libX11 xorgproto tcl freeglut freetype sfml libXi libXmu libXext libXt libSM libICE - libpng pkgconfig gettext intltool + libpng pkg-config gettext intltool ]; configureFlags = [ "--with-tcl=${tcl}/lib" ]; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 6dd9d711a28..e16e62f82fb 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: +{ lib, stdenv, fetchurl, pkg-config, SDL2, libogg, libvorbis, zlib, unzip }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-tools" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; enableParallelBuilding = true; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 1251c38e0fd..7089c81ee35 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, curl, expat , jansson, libpng, libjpeg, libGLU, libGL, libXxf86vm, pcre -, pkgconfig, SDL2, vim, speex }: +, pkg-config, SDL2, vim, speex }: stdenv.mkDerivation rec { pname = "ezquake"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rfp816gnp7jfd27cg1la5n1q6z2wgd9qljnlmnx7v2jixql8brf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim speex ]; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index af75dbfa226..065e82a0e47 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkg-config, cmake , perl, gmp, libtap, gperf , perlPackages, python3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake perl pkgconfig + cmake perl pkg-config ] ++ (with perlPackages; TaskFreecellSolverTesting.buildInputs ++ [ GamesSolitaireVerify StringShellQuote TaskFreecellSolverTesting TemplateToolkit ]); diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index cec3349b2a6..de5f2751fd1 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 , zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index fff8426c16a..c80dc2b0703 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx -, pkgconfig, intltool, fontconfig, libzip, zip, zlib }: +, pkg-config, intltool, fontconfig, libzip, zip, zlib }: let version = "1.08.20121209"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx - pkgconfig intltool fontconfig libzip zip zlib + pkg-config intltool fontconfig libzip zip zlib ]; preConfigure = '' diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index ad84005c155..53b008d11dd 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let version = "0.16.1"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; }; - nativeBuildInputs = [ pkgconfig gettext python3 ]; + nativeBuildInputs = [ pkg-config gettext python3 ]; buildInputs = [ SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 74499263650..4ebf22b46b0 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf -, glew, zlib, icu, pkgconfig, cairo, libvpx }: +, glew, zlib, icu, pkg-config, cairo, libvpx }: stdenv.mkDerivation { pname = "anura-engine"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - which pkgconfig + which pkg-config ]; buildInputs = [ diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index 6798b4d1b9e..d1521dae3c4 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, pkgconfig, SDL, SDL_mixer, SDL_Pango, glib }: +{ lib, stdenv, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }: perlPackages.buildPerlModule { pname = "frozen-bubble"; @@ -10,7 +10,7 @@ perlPackages.buildPerlModule { }; patches = [ ./fix-compilation.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 909ea662400..dd6d46ec6a2 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU, libGL, wxGTK, libX11, xorgproto +{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK, libX11, xorgproto , runtimeShell }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 glib libGLU libGL wxGTK libX11 xorgproto ]; preBuild = '' diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index f3d897d32af..feff18e9bb6 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: +{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }: let version = "1.06.002"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python glib gtk2 readline ]; configureFlags = [ "--with-gtk" "--with--board3d" ]; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index ef815b3bacc..32ee954408d 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkgconfig, libgnome, libgnomeui, GConf }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkg-config, libgnome, libgnomeui, GConf }: stdenv.mkDerivation { name = "gtetrinet-0.7.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ libgnome libgnomeui ]; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index edfe13c9821..9cf93176b9a 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 -, game-music-emu, pkgconfig }: +, game-music-emu, pkg-config }: let zmusic-src = fetchFromGitHub { @@ -15,7 +15,7 @@ let src = zmusic-src; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; preConfigure = '' sed -i \ @@ -38,7 +38,7 @@ let fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ SDL2 libGL diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index f31a44e97c0..ea714d8bc7c 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,5 +1,5 @@ { mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut -, lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer +, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools , llvm @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"; }; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 0450e8eafd0..5c35219c19b 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: +{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkg-config, lua, zlib, unzip }: let version = "3.3.2"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-llua -lgcc_s"; - nativeBuildInputs = [ pkgconfig unzip ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ]; postPatch = '' diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 459d1a69633..3ec196b7373 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsaLib, libpng , pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "04jzs8wad2b3g9hvnijr4r89iiw6b1i44zdzkg0dy447lrw6l6xc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index a7e6eeef93c..2a8f68ddd2c 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -5,7 +5,7 @@ , file , gtk3 , intltool -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; }; - nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; + nativeBuildInputs = [ intltool makeWrapper pkg-config ]; buildInputs = [ curl gtk3 ]; postInstall = '' diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index e19febe42f1..4cb9d3a6c04 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , curl , boost , liboauth @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-3xFlFokqdD1Nstu7TSUCaHUxvSodIb12QNVjmNgn9gs="; }; - nativeBuildInputs = [ cmake pkgconfig help2man ]; + nativeBuildInputs = [ cmake pkg-config help2man ]; buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ]; diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index 12e9cfc2d63..9d10691fe49 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, cmake, openal, pkgconfig, libogg, +{ lib, stdenv, fetchFromGitLab, cmake, openal, pkg-config, libogg, libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "089rblf8xw3c6dq96vnfla6zl8gxcpcbc1bj5jysfpq63hhdpypz"; }; - nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkg-config ]; buildInputs = [ libGLU openal SDL2 libogg libvorbis libpng libjpeg_turbo ]; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 01a923838f0..bb91891a682 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, openssl }: +{ lib, stdenv, fetchurl, pkg-config, gtk, openssl }: stdenv.mkDerivation rec { name = "macopix-1.7.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk openssl ]; preConfigure = '' diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 361752b714d..d6ba771de7e 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less , buildPackages -, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkgconfig, qt5 +, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 }: let @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ] ++ lib.optionals x11Mode [ mkfontdir bdftopcf ] ++ lib.optionals qtMode [ - pkgconfig mkfontdir qt5.qtbase.dev + pkg-config mkfontdir qt5.qtbase.dev qt5.qtmultimedia.dev qt5.wrapQtAppsHook bdftopcf ]; diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index de66d8996b4..8b58ec67eda 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net, wxGTK30 }: +{ lib, stdenv, cmake, fetchurl, pkg-config, SDL, SDL_mixer, SDL_net, wxGTK30 }: stdenv.mkDerivation rec { pname = "odamex"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d4v1l7kghkz1xz92jxlx50x3iy94z7ix1i3209m5j5545qzxrqq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ]; meta = { diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index dff9eea788f..9dc267032ae 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig +{ lib, stdenv, fetchurl, cmake, pkg-config , SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal , freealut, readline, gcc-unwrapped , enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index cf15568b37d..e5ac89239a3 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig +{ stdenv, lib, fetchFromGitHub, pkg-config , alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 4f90cecb16b..306c5de3b43 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -1,7 +1,7 @@ /* The reusable code, and package attributes, between OpenRA engine packages (engine.nix) and out-of-tree mod packages (mod.nix). */ -{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper +{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper , lua, mono, dotnetPackages, python , libGL, freetype, openal, SDL2 , zenity @@ -62,7 +62,7 @@ in { curl unzip dos2unix - pkgconfig + pkg-config makeWrapper mkdirp mono diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8cb8ca8ea24..b42c7d2216e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, pkgconfig, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir +{ lib, stdenv, fetchurl, fetchzip, pkg-config, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , writeScriptBin, makeWrapper, runtimeShell @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"; }; - nativeBuildInputs = [ pkgconfig which makeWrapper ]; + nativeBuildInputs = [ pkg-config which makeWrapper ]; buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ] ++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index d5128aaec07..b0fc9483629 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg , SDL2, glew, boost, libav, portaudio, epoxy }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./performous-cmake.patch ]; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; buildInputs = [ glibmm libxmlxx pango librsvg diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index bc3b591d5c7..60609759559 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer -, pkgconfig, libGLU, libGL, git, jsoncpp }: +, pkg-config, libGLU, libGL, git, jsoncpp }: stdenv.mkDerivation rec { pname = "pingus"; version = "unstable-0.7.6.0.20191104"; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; src = fetchgit { url = "https://gitlab.com/pingus/pingus/"; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index d801e7c82ec..0d348e3fa9e 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2 , SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL , glew }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index 140cba2e9ae..f966798ce4e 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config, qmake , SDL2, fluidsynth, libsndfile, libvorbis, mpg123, qtbase }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 fluidsynth libsndfile libvorbis mpg123 qtbase ]; diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index 4b24de28c45..07c2b9e33ad 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, curl, ed, pkgconfig, freetype, zlib, libX11 +, curl, ed, pkg-config, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - curl ed pkgconfig + curl ed pkg-config ]; makeFlags = [ "-C" "src/" "prefix=$(out)" ]; diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 1272521e55f..1dfeaf3c3a8 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2.dev ]; meta = { diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 95a168b7d2a..382c2ef71ae 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, ncurses }: with lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1bwrkxm83r9ajpkd6x03nqvmdfpf5vz6yfy0c97pq3v3ykj74082"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; makeFlags = [ "execgamesdir=$(out)/bin" ]; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 47c17ce60d7..227ab720490 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkg-config, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ ./file-existence.patch diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 24ea62d9db8..2582161eee4 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11 -, makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook +, makeWrapper, pkg-config, perl, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper - pkgconfig perl wrapGAppsHook ]; + pkg-config perl wrapGAppsHook ]; buildInputs = [ gtk3 libX11 ]; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 97fc0b3104d..942c93ec043 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer +{ lib, stdenv, fetchurl, pkg-config, unzip, zlib, libpng, bzip2, SDL, SDL_mixer , buildEnv, config, runtimeShell }: @@ -115,7 +115,7 @@ let sourceRoot = "."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; configurePhase = let diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 3bf368e807b..c0bb7b67e04 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, -libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }: +libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl }: let version = "2.2.2-r6553"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 2f8a9d9885b..009457a9dad 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar +{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs"; }; - nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ]; buildInputs = [ wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 glib minizip alure diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 01048c82543..31b36efc490 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl +{ lib, stdenv, fetchurl, cmake, pkg-config, SDL2, SDL2_image , curl , libogg, libvorbis, libGLU, libGL, openal, boost, glew , libpng, freetype }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU libGL openal boost glew libpng freetype diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 09193232d32..19f562d54af 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkgconfig, python3, alsaLib +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsaLib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' ''; - nativeBuildInputs = [ cmake pkgconfig icoutils ]; + nativeBuildInputs = [ cmake pkg-config icoutils ]; buildInputs = [ python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 9e08b6c1e41..289b4e386be 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, - cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf, imagemagick }: + cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }: stdenv.mkDerivation rec { version = "0.9.24"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo - librsvg gettext libpaper fribidi pkgconfig gperf imagemagick ]; + librsvg gettext libpaper fribidi pkg-config gperf imagemagick ]; hardeningDisable = [ "format" ]; makeFlags = [ "GPERF=${gperf}/bin/gperf" "PREFIX=$$out" diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/games/tuxtype/default.nix index 1032eba4bcb..0e32ebfbab9 100644 --- a/pkgs/games/tuxtype/default.nix +++ b/pkgs/games/tuxtype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }: stdenv.mkDerivation rec { version = "1.8.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace 'PKG_CHECK_MODULES([SDL_ttf],' 'PKG_CHECK_MODULES([SDL_TTF],' ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ librsvg libxml2 SDL SDL_image SDL_mixer SDL_net SDL_ttf t4kcommon ]; configureFlags = [ "--without-sdlpango" ]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index daaa3110244..9f38e43222c 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, -pkgconfig}: +pkg-config}: stdenv.mkDerivation { name = "ultimate-stunts-0.7.6.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL SDL_image freealut openal libvorbis ]; postPatch = '' diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 397946acf58..63866d4bca9 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , fetchFromGitHub , fetchpatch -, pkgconfig +, pkg-config , lua , fpc , pcre @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; patches = [ diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 0c6d2d9d952..f1ac122ccc4 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libGLU, libGL +{ stdenv, lib, fetchurl, pkg-config, libGLU, libGL , SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU libGL ]; postUnpack = '' diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index bc499d736f0..407603687ba 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchsvn, pkgconfig, sconsPackages, libGLU, libGL, SDL2, SDL2_image +{ lib, stdenv, fetchFromGitHub, fetchsvn, pkg-config, sconsPackages, libGLU, libGL, SDL2, SDL2_image , libvorbis, bullet, curl, gettext, writeTextFile , data ? fetchsvn { @@ -20,7 +20,7 @@ let sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 464095e714b..6b52194ffca 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake , zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer -, SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkgconfig +, SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkg-config , gettext, intltool, libtool, perl }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); nativeBuildInputs = [ - autoconf automake gettext intltool libtool pkgconfig + autoconf automake gettext intltool libtool pkg-config ]; buildInputs = [ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 95c3ec3630f..1f6e2995a2a 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, autoconf, automake -, perl, unzip, zip, which, pkgconfig, qtbase, qtscript +, perl, unzip, zip, which, pkg-config, qtbase, qtscript , SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr , withVideos ? false }: @@ -26,7 +26,7 @@ mkDerivation rec { glew physfs fribidi libXrandr ]; nativeBuildInputs = [ - perl zip unzip pkgconfig autoconf automake + perl zip unzip pkg-config autoconf automake ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 71734b9ff98..eda6dfb717c 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0rawcm3d1qwf4wxqcbjipl6h30sfv7z70viji28q4givi5hysvka"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost libvorbis fribidi dbus libpng pcre openssl icu ] diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix index 82209a69a44..5a6bc34fea5 100644 --- a/pkgs/games/wyvern/default.nix +++ b/pkgs/games/wyvern/default.nix @@ -6,7 +6,7 @@ , innoextract , curl , cmake -, pkgconfig +, pkg-config , openssl }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256:1nd5qla3p1jrssg5fqal8m3jcbxax0wsfc8cp97jdrpqlcgqfmrx"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 95542491b99..23cfa69fce6 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu -, libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo, pango +, libXext, gnuchess, texinfo, libXpm, pkg-config, librsvg, cairo, pango , gtk2 }: let @@ -14,7 +14,7 @@ let }; buildInputs = [ libX11 xorgproto libXt libXaw libSM libICE libXmu - libXext gnuchess texinfo libXpm pkgconfig librsvg + libXext gnuchess texinfo libXpm pkg-config librsvg cairo pango gtk2 ]; in diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 25f536885d6..58aa6daeece 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage +{ stdenv, lib, fetchhg, cmake, pkg-config, makeWrapper, callPackage , soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme , serverOnly ? false }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ] ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper python3 ]; preConfigure = '' ln -s ${sqlite}/* sqlite/ diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 00416eb1c98..edee0db2617 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , SDL , SDL_image , mesa @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ SDL.dev From 6e65b724beb0de1a94089b55a95e2b683b56e587 Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Sun, 17 Jan 2021 19:13:34 +1100 Subject: [PATCH 34/38] nixos/snapper: improve config example In the default configuration we have timers for creating and deleting snapper snapshots, and it looks like if we just create configs with correct mountpoints we will get automatic snapshots (which either used to be true, or seems to be only true on Archlinux according to their wiki). In default snapper configuration TIMELINE_CREATE and TIMELINE_CLEANUP are set to "no", so just providing configs won't be enough for having automatic backups, which are the main usecase for snapper. In other linux distributions you would use `snapper create-config` to generate configs for partitions and you'd have a chance to notice that TIMELINE_CREATE is set to no. Also, my guess is that it might be set to no by default for safety reasons in regular distros, so that the config won't be actioned upon until the user finishes customizing it. --- nixos/modules/services/misc/snapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index 3560d08520b..a821b9b6bf6 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -48,6 +48,8 @@ in subvolume = "/home"; extraConfig = '' ALLOW_USERS="alice" + TIMELINE_CREATE=yes + TIMELINE_CLEANUP=yes ''; }; }; From 06dcf42dbb39103da35d4307b1c1c0ba183e33cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Jan 2021 09:26:01 +0100 Subject: [PATCH 35/38] python3Packages.zigpy: 0.29.0 -> 0.30.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 483c239ae5d..9a6b0feb3b7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "1r4i2ya9f241rls9mi24dksx4srrzi8agshnqy12rclxlh7qb1aw"; + sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1"; }; propagatedBuildInputs = [ From 9bf0304ee9f171214a1648eb0783463461393258 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 09:56:40 +0100 Subject: [PATCH 36/38] python3Packages.voluptuous-serialize: enable tests --- .../voluptuous-serialize/default.nix | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index d054a32c30e..4c31b5f758a 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, voluptuous +}: buildPythonPackage rec { pname = "voluptuous-serialize"; @@ -6,28 +12,24 @@ buildPythonPackage rec { disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6"; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "1km2y1xaagkdvsy3bmi1sc040x5yyfdw6llmwdv9z8nz67m9v1ya"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ voluptuous ]; + + checkInputs = [ + pytestCheckHook voluptuous ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - py.test - ''; - - # no tests in PyPI tarball - doCheck = false; + pythonImportsCheck = [ "voluptuous_serialize" ]; meta = with lib; { - homepage = "https://github.com/balloob/voluptuous-serialize"; + homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; license = licenses.asl20; description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; maintainers = with maintainers; [ etu ]; From db4cdb0b9b4848ff8e2581fa700d6de5652f74a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Jan 2021 09:28:27 +0100 Subject: [PATCH 37/38] home-assistant: 2021.1.3 -> 2021.1.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3506998e194..b99c7234f8e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.1.3"; + version = "2021.1.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ecc66caf585..a54eca3952f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.1.3"; + hassVersion = "2021.1.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "168njrzvqr3wn1xk02q1yn1f90mf1hds6m8lffgkql8m6a6576hn"; + sha256 = "03aa7kd216rnp8h80nv002ahafiy0031lxk1bkwcirrznphcw7sj"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -179,6 +179,8 @@ in with py.pkgs; buildPythonApplication rec { # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" + # RuntimeError: Event loop is closed + "test_remove_older_logs" ]; preCheck = '' From 5d9a3e2e5a05b979d3953eeeb1a8282b241a1f53 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 17 Jan 2021 11:56:43 +0100 Subject: [PATCH 38/38] cargo-c: 0.7.0 -> 0.7.1 --- pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ce57194bc49..e28f9165ebb 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.0"; + version = "0.7.1"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj"; + sha256 = "1a348ys4lbgsr23px81kw985i5bp8z75wgzl9l2jv9sdzirpb8k4"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h"; + sha256 = "1f78wlid8jx26pqybmafzcl1656nnp87hdiib0v1p5k73mk4ymvy"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r"; + cargoSha256 = "1nj54igm57h9d8hhqdgkay2nnblcdxhpnha68jqvjazd8a0bq3la"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]