MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-01-17 12:38:49 +00:00 committed by GitHub
commit 9541eb734d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1090 changed files with 3174 additions and 2443 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/snapper.nix
View file

@ -48,6 +48,8 @@ in
subvolume = "/home";
extraConfig = ''
ALLOW_USERS="alice"
TIMELINE_CREATE=yes
TIMELINE_CLEANUP=yes
'';
};
};

4
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
View file

@ -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
];

4
pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
View file

@ -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" ];

4
pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub
, pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }:
, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }:
stdenv.mkDerivation rec {
pname = "lightdm-tiny-greeter";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ lightdm gtk3 glib ];
postUnpack = if conf != "" then ''

4
pkgs/applications/display-managers/lightdm/default.nix
View file

@ -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
];

4
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View file

@ -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 ]);

4
pkgs/applications/display-managers/sddm/default.nix
View file

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs
, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs
, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
}:
@ -27,7 +27,7 @@ in mkDerivation {
sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp
'';
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ];
buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd

4
pkgs/applications/misc/abook/default.nix
View file

@ -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 = {

4
pkgs/applications/misc/appeditor/default.nix
View file

@ -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
];

4
pkgs/applications/misc/artha/default.nix
View file

@ -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 = [

4
pkgs/applications/misc/audio/sox/default.nix
View file

@ -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 ++

4
pkgs/applications/misc/ausweisapp2/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/bemenu/default.nix
View file

@ -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)"];

4
pkgs/applications/misc/bibletime/default.nix
View file

@ -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

4
pkgs/applications/misc/birdtray/default.nix
View file

@ -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
];

4
pkgs/applications/misc/blogc/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/calibre/default.nix
View file

@ -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;

4
pkgs/applications/misc/cardpeek/default.nix
View file

@ -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;

4
pkgs/applications/misc/cataract/build.nix
View file

@ -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 = ''

4
pkgs/applications/misc/cbatticon/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/chewing-editor/default.nix
View file

@ -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; {

4
pkgs/applications/misc/cipher/default.nix
View file

@ -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
];

4
pkgs/applications/misc/clight/clightd.nix
View file

@ -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; [

4
pkgs/applications/misc/clight/default.nix
View file

@ -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
];

4
pkgs/applications/misc/clipcat/default.nix
View file

@ -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

4
pkgs/applications/misc/clipit/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/cpu-x/default.nix
View file

@ -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
];

4
pkgs/applications/misc/devilspie2/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/diff-pdf/default.nix
View file

@ -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";

4
pkgs/applications/misc/digitalbitbox/default.nix
View file

@ -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
];

4
pkgs/applications/misc/doomseeker/default.nix
View file

@ -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";

4
pkgs/applications/misc/dunst/default.nix
View file

@ -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

4
pkgs/applications/misc/eaglemode/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/elogind/default.nix
View file

@ -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

4
pkgs/applications/misc/epdfview/default.nix
View file

@ -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" ];

4
pkgs/applications/misc/et/default.nix
View file

@ -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

7
pkgs/applications/misc/etesync-dav/default.nix
View file

@ -1,12 +1,12 @@
{ lib, python3Packages, radicale3 }:
{ lib, stdenv, python3Packages, radicale3 }:
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; [
@ -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
};
}

4
pkgs/applications/misc/evtest/default.nix
View file

@ -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 {

4
pkgs/applications/misc/far2l/default.nix
View file

@ -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;

4
pkgs/applications/misc/fbreader/default.nix
View file

@ -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

4
pkgs/applications/misc/fehlstart/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/fme/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/font-manager/default.nix
View file

@ -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

4
pkgs/applications/misc/formatter/default.nix
View file

@ -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
];

6
pkgs/applications/misc/fsv/default.nix
View file

@ -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; {

4
pkgs/applications/misc/gImageReader/default.nix
View file

@ -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

4
pkgs/applications/misc/galculator/default.nix
View file

@ -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; {

4
pkgs/applications/misc/gammu/default.nix
View file

@ -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 ]

4
pkgs/applications/misc/garmin-plugin/default.nix
View file

@ -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}"

4
pkgs/applications/misc/girara/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/gkrellm/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/gksu/default.nix
View file

@ -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 = [

4
pkgs/applications/misc/glom/default.nix
View file

@ -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

4
pkgs/applications/misc/gmrun/default.nix
View file

@ -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;

4
pkgs/applications/misc/gmtp/default.nix
View file

@ -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;

4
pkgs/applications/misc/gnome-firmware-updater/default.nix
View file

@ -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
];

4
pkgs/applications/misc/gnome-multi-writer/default.nix
View file

@ -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
];

4
pkgs/applications/misc/gnome-recipes/default.nix
View file

@ -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

4
pkgs/applications/misc/gnome-usage/default.nix
View file

@ -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
];

4
pkgs/applications/misc/goldendict/default.nix
View file

@ -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

4
pkgs/applications/misc/gosmore/default.nix
View file

@ -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}

4
pkgs/applications/misc/gpa/default.nix
View file

@ -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; {

4
pkgs/applications/misc/gphoto2/default.nix
View file

@ -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
];

4
pkgs/applications/misc/gphoto2/gphotofs.nix
View file

@ -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
];

4
pkgs/applications/misc/gpscorrelate/default.nix
View file

@ -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
];

4
pkgs/applications/misc/gpx-viewer/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/green-pdfviewer/default.nix
View file

@ -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 = [

4
pkgs/applications/misc/grip/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/gsimplecal/default.nix
View file

@ -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";

4
pkgs/applications/misc/gtk2fontsel/default.nix
View file

@ -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;

4
pkgs/applications/misc/gummi/default.nix
View file

@ -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

4
pkgs/applications/misc/gv/default.nix
View file

@ -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
];

4
pkgs/applications/misc/gxmessage/default.nix
View file

@ -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 = {

4
pkgs/applications/misc/gxneur/default.nix
View file

@ -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

4
pkgs/applications/misc/hstr/default.nix
View file

@ -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)" ];

4
pkgs/applications/misc/jgmenu/default.nix
View file

@ -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
];

4
pkgs/applications/misc/k2pdfopt/default.nix
View file

@ -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 "<djvu.h>" "<libdjvu/ddjvuapi.h>"
'';
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs =
let

4
pkgs/applications/misc/libosmocore/default.nix
View file

@ -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 = [

4
pkgs/applications/misc/librecad/default.nix
View file

@ -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
];

4
pkgs/applications/misc/lighthouse/default.nix
View file

@ -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
];

4
pkgs/applications/misc/ltwheelconf/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/lyx/default.nix
View file

@ -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

4
pkgs/applications/misc/mako/default.nix
View file

@ -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" ];

4
pkgs/applications/misc/mediainfo-gui/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/mediainfo/default.nix
View file

@ -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/";

4
pkgs/applications/misc/megacmd/default.nix
View file

@ -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 = [

4
pkgs/applications/misc/megasync/default.nix
View file

@ -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

4
pkgs/applications/misc/merkaartor/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/milu/default.nix
View file

@ -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

4
pkgs/applications/misc/minder/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/moonlight-embedded/default.nix
View file

@ -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
];

4
pkgs/applications/misc/mupdf/1.17.nix
View file

@ -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 ]

4
pkgs/applications/misc/mupdf/default.nix
View file

@ -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 ]

4
pkgs/applications/misc/mysql-workbench/default.nix
View file

@ -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

4
pkgs/applications/misc/navit/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/nnn/default.nix
View file

@ -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=" ];

4
pkgs/applications/misc/notejot/default.nix
View file

@ -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
];

4
pkgs/applications/misc/notify-osd-customizable/default.nix
View file

@ -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

4
pkgs/applications/misc/notify-osd/default.nix
View file

@ -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

4
pkgs/applications/misc/nut/default.nix
View file

@ -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"

Some files were not shown because too many files have changed in this diff Show more