git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix

continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.

commit9bb3fccb5b55326cb3c2c507464a8a28d44d1730 authorJonathan Ringer <jonringer117@gmail.com> dateMon 18 Jan 2021, 22:50 (6 years ago) parent200bb8c
1653 files changed+3872−3872
pkgs/applications/accessibility/contrast/default.nix+2−2 pkgs/applications/accessibility/dasher/default.nix+2−2 pkgs/applications/accessibility/mousetweaks/default.nix+2−2 pkgs/applications/audio/a2jmidid/default.nix+2−2 pkgs/applications/audio/adlplug/default.nix+2−2 pkgs/applications/audio/aj-snapshot/default.nix+2−2 pkgs/applications/audio/ams-lv2/default.nix+2−2 pkgs/applications/audio/ario/default.nix+2−2 pkgs/applications/audio/asunder/default.nix+2−2 pkgs/applications/audio/audacious/default.nix+2−2 pkgs/applications/audio/audio-recorder/default.nix+2−2 pkgs/applications/audio/aumix/default.nix+3−3 pkgs/applications/audio/axoloti/dfu-util.nix+2−2 pkgs/applications/audio/axoloti/libusb1.nix+2−2 pkgs/applications/audio/bitmeter/default.nix+2−2 pkgs/applications/audio/bjumblr/default.nix+2−2 pkgs/applications/audio/bristol/default.nix+2−2 pkgs/applications/audio/bsequencer/default.nix+2−2 pkgs/applications/audio/bshapr/default.nix+2−2 pkgs/applications/audio/bslizr/default.nix+2−2 pkgs/applications/audio/cadence/default.nix+2−2 pkgs/applications/audio/calf/default.nix+2−2 pkgs/applications/audio/cantata/default.nix+2−2 pkgs/applications/audio/carla/default.nix+2−2 pkgs/applications/audio/clementine/default.nix+2−2 pkgs/applications/audio/cmus/default.nix+2−2 pkgs/applications/audio/cmusfm/default.nix+2−2 pkgs/applications/audio/cozy-audiobooks/default.nix+2−2 pkgs/applications/audio/deadbeef/default.nix+2−2 pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix+2−2 pkgs/applications/audio/deadbeef/plugins/infobar.nix+2−2 pkgs/applications/audio/deadbeef/plugins/lyricbar.nix+2−2 pkgs/applications/audio/deadbeef/plugins/mpris2.nix+2−2 pkgs/applications/audio/denemo/default.nix+2−2 pkgs/applications/audio/dragonfly-reverb/default.nix+2−2 pkgs/applications/audio/drumgizmo/default.nix+2−2 pkgs/applications/audio/drumkv1/default.nix+2−2 pkgs/applications/audio/easytag/default.nix+2−2 pkgs/applications/audio/ekho/default.nix+2−2 pkgs/applications/audio/ensemble-chorus/default.nix+2−2 pkgs/applications/audio/espeak-ng/default.nix+2−2 pkgs/applications/audio/espeak/edit.nix+2−2 pkgs/applications/audio/faust/faust1.nix+2−2 pkgs/applications/audio/faust/faust2.nix+3−3 pkgs/applications/audio/faust/faust2jackrust.nix+2−2 pkgs/applications/audio/flacon/default.nix+2−2 pkgs/applications/audio/fluidsynth/default.nix+2−2 pkgs/applications/audio/fmsynth/default.nix+2−2 pkgs/applications/audio/fomp/default.nix+2−2 pkgs/applications/audio/foo-yc20/default.nix+2−2 pkgs/applications/audio/freewheeling/default.nix+2−2 pkgs/applications/audio/gigedit/default.nix+2−2 pkgs/applications/audio/gjay/default.nix+2−2 pkgs/applications/audio/gmpc/default.nix+3−3 pkgs/applications/audio/gnome-podcasts/default.nix+2−2 pkgs/applications/audio/gradio/default.nix+2−2 pkgs/applications/audio/grandorgue/default.nix+2−2 pkgs/applications/audio/gtkpod/default.nix+2−2 pkgs/applications/audio/guitarix/default.nix+2−2 pkgs/applications/audio/gxmatcheq-lv2/default.nix+2−2 pkgs/applications/audio/gxplugins-lv2/default.nix+2−2 pkgs/applications/audio/helio-workstation/default.nix+2−2 pkgs/applications/audio/helm/default.nix+2−2 pkgs/applications/audio/hybridreverb2/default.nix+2−2 pkgs/applications/audio/hydrogen/0.nix+2−2 pkgs/applications/audio/hydrogen/default.nix+2−2 pkgs/applications/audio/iannix/default.nix+2−2 pkgs/applications/audio/infamousPlugins/default.nix+2−2 pkgs/applications/audio/ingen/default.nix+2−2 pkgs/applications/audio/ir.lv2/default.nix+2−2 pkgs/applications/audio/jack-capture/default.nix+2−2 pkgs/applications/audio/jack-oscrolloscope/default.nix+2−2 pkgs/applications/audio/jack-rack/default.nix+2−2 pkgs/applications/audio/jackmeter/default.nix+2−2 pkgs/applications/audio/jackmix/default.nix+2−2 pkgs/applications/audio/jalv/default.nix+2−2 pkgs/applications/audio/jamin/default.nix+2−2 pkgs/applications/audio/klick/default.nix+2−2 pkgs/applications/audio/klystrack/default.nix+2−2 pkgs/applications/audio/kmetronome/default.nix+2−2 pkgs/applications/audio/ladspa-plugins/default.nix+2−2 pkgs/applications/audio/lash/default.nix+2−2 pkgs/applications/audio/librespot/default.nix+2−2 pkgs/applications/audio/linuxband/default.nix+2−2 pkgs/applications/audio/linuxsampler/default.nix+2−2 pkgs/applications/audio/lmms/default.nix+2−2 pkgs/applications/audio/lollypop/default.nix+2−2 pkgs/applications/audio/lsp-plugins/default.nix+2−2 pkgs/applications/audio/ltc-tools/default.nix+2−2 pkgs/applications/audio/luppp/default.nix+2−2 pkgs/applications/audio/lv2-cpp-tools/default.nix+2−2 pkgs/applications/audio/lv2bm/default.nix+2−2 pkgs/applications/audio/mda-lv2/default.nix+2−2 pkgs/applications/audio/mellowplayer/default.nix+2−2 pkgs/applications/audio/meterbridge/default.nix+2−2 pkgs/applications/audio/meters_lv2/default.nix+2−2 pkgs/applications/audio/mhwaveedit/default.nix+2−2 pkgs/applications/audio/milkytracker/default.nix+2−2 pkgs/applications/audio/mimic/default.nix+2−2 pkgs/applications/audio/mixxx/default.nix+2−2 pkgs/applications/audio/moc/default.nix+2−2 pkgs/applications/audio/mp3info/default.nix+2−2 pkgs/applications/audio/mp3splt/default.nix+2−2 pkgs/applications/audio/mpc/default.nix+2−2 pkgs/applications/audio/muse/default.nix+2−2 pkgs/applications/audio/musescore/default.nix+2−2 pkgs/applications/audio/ncmpc/default.nix+2−2 pkgs/applications/audio/ncmpcpp/default.nix+2−2 pkgs/applications/audio/ninjas2/default.nix+2−2 pkgs/applications/audio/noise-repellent/default.nix+2−2 pkgs/applications/audio/non/default.nix+2−2 pkgs/applications/audio/nova-filters/default.nix+2−2 pkgs/applications/audio/openmpt123/default.nix+2−2 pkgs/applications/audio/opus-tools/default.nix+2−2 pkgs/applications/audio/opusfile/default.nix+2−2 pkgs/applications/audio/padthv1/default.nix+2−2 pkgs/applications/audio/pamix/default.nix+2−2 pkgs/applications/audio/paprefs/default.nix+2−2 pkgs/applications/audio/parlatype/default.nix+2−2 pkgs/applications/audio/patchage/default.nix+2−2 pkgs/applications/audio/paulstretch/default.nix+2−2 pkgs/applications/audio/pavucontrol/default.nix+2−2 pkgs/applications/audio/pianobar/default.nix+2−2 pkgs/applications/audio/pithos/default.nix+2−2 pkgs/applications/audio/plugin-torture/default.nix+2−2 pkgs/applications/audio/polyphone/default.nix+2−2 pkgs/applications/audio/ponymix/default.nix+2−2 pkgs/applications/audio/praat/default.nix+2−2 pkgs/applications/audio/projectm/default.nix+2−2 pkgs/applications/audio/pulseaudio-modules-bt/default.nix+2−2 pkgs/applications/audio/pulseeffects/default.nix+2−2 pkgs/applications/audio/qmidinet/default.nix+2−2 pkgs/applications/audio/qmidiroute/default.nix+2−2 pkgs/applications/audio/qmmp/default.nix+2−2 pkgs/applications/audio/qsampler/default.nix+2−2 pkgs/applications/audio/qsynth/default.nix+2−2 pkgs/applications/audio/qtscrobbler/default.nix+2−2 pkgs/applications/audio/radiotray-ng/default.nix+2−2 pkgs/applications/audio/rhvoice/default.nix+2−2 pkgs/applications/audio/rhythmbox/default.nix+2−2 pkgs/applications/audio/rosegarden/default.nix+2−2 pkgs/applications/audio/samplv1/default.nix+2−2 pkgs/applications/audio/seq24/default.nix+2−2 pkgs/applications/audio/setbfree/default.nix+2−2 pkgs/applications/audio/sfizz/default.nix+2−2 pkgs/applications/audio/sfxr/default.nix+2−2 pkgs/applications/audio/sidplayfp/default.nix+2−2 pkgs/applications/audio/sisco.lv2/default.nix+2−2 pkgs/applications/audio/snapcast/default.nix+2−2 pkgs/applications/audio/snd/default.nix+2−2 pkgs/applications/audio/sonic-lineup/default.nix+2−2 pkgs/applications/audio/sonic-pi/default.nix+2−2 pkgs/applications/audio/sooperlooper/default.nix+2−2 pkgs/applications/audio/sound-juicer/default.nix+2−2 pkgs/applications/audio/soundkonverter/default.nix+2−2 pkgs/applications/audio/soundscape-renderer/default.nix+2−2 pkgs/applications/audio/spectmorph/default.nix+2−2 pkgs/applications/audio/spectrojack/default.nix+2−2 pkgs/applications/audio/speech-denoiser/default.nix+2−2 pkgs/applications/audio/spek/default.nix+2−2 pkgs/applications/audio/spotify-tui/default.nix+2−2 pkgs/applications/audio/spotifyd/default.nix+2−2 pkgs/applications/audio/squishyball/default.nix+2−2 pkgs/applications/audio/stone-phaser/default.nix+2−2 pkgs/applications/audio/strawberry/default.nix+2−2 pkgs/applications/audio/streamripper/default.nix+2−2 pkgs/applications/audio/swh-lv2/default.nix+2−2 pkgs/applications/audio/synthv1/default.nix+2−2 pkgs/applications/audio/talentedhack/default.nix+2−2 pkgs/applications/audio/timemachine/default.nix+2−2 pkgs/applications/audio/tony/default.nix+2−2 pkgs/applications/audio/transcode/default.nix+2−2 pkgs/applications/audio/traverso/default.nix+2−2 pkgs/applications/audio/uade123/default.nix+2−2 pkgs/applications/audio/vcv-rack/default.nix+2−2 pkgs/applications/audio/vimpc/default.nix+2−2 pkgs/applications/audio/vocal/default.nix+2−2 pkgs/applications/audio/vocproc/default.nix+2−2 pkgs/applications/audio/vorbis-tools/default.nix+2−2 pkgs/applications/audio/waon/default.nix+2−2 pkgs/applications/audio/wolf-shaper/default.nix+2−2 pkgs/applications/audio/x42-avldrums/default.nix+2−2 pkgs/applications/audio/x42-gmsynth/default.nix+2−2 pkgs/applications/audio/x42-plugins/default.nix+2−2 pkgs/applications/audio/xmp/default.nix+2−2 pkgs/applications/audio/xsynth-dssi/default.nix+2−2 pkgs/applications/audio/yoshimi/default.nix+2−2 pkgs/applications/audio/zam-plugins/default.nix+2−2 pkgs/applications/blockchains/aeon/default.nix+2−2 pkgs/applications/blockchains/bitcoin-abc.nix+2−2 pkgs/applications/blockchains/bitcoin-classic.nix+2−2 pkgs/applications/blockchains/bitcoin-gold.nix+2−2 pkgs/applications/blockchains/bitcoin-knots.nix+2−2 pkgs/applications/blockchains/bitcoin-unlimited.nix+2−2 pkgs/applications/blockchains/btcdeb/default.nix+2−2 pkgs/applications/blockchains/cgminer/default.nix+2−2 pkgs/applications/blockchains/clightning.nix+2−2 pkgs/applications/blockchains/dashpay.nix+2−2 pkgs/applications/blockchains/dero.nix+2−2 pkgs/applications/blockchains/digibyte.nix+2−2 pkgs/applications/blockchains/dogecoin.nix+2−2 pkgs/applications/blockchains/litecoin.nix+2−2 pkgs/applications/blockchains/masari.nix+2−2 pkgs/applications/blockchains/monero-gui/default.nix+2−2 pkgs/applications/blockchains/monero/default.nix+2−2 pkgs/applications/blockchains/namecoin.nix+2−2 pkgs/applications/blockchains/nano-wallet/default.nix+2−2 pkgs/applications/blockchains/particl/particl-core.nix+2−2 pkgs/applications/blockchains/pivx.nix+2−2 pkgs/applications/blockchains/stellar-core.nix+2−2 pkgs/applications/blockchains/vertcoin.nix+2−2 pkgs/applications/editors/amp/default.nix+2−2 pkgs/applications/editors/apostrophe/default.nix+2−2 pkgs/applications/editors/aseprite/default.nix+2−2 pkgs/applications/editors/bless/default.nix+2−2 pkgs/applications/editors/bluefish/default.nix+2−2 pkgs/applications/editors/codeblocks/default.nix+2−2 pkgs/applications/editors/edit/default.nix+2−2 pkgs/applications/editors/emacs-modes/melpa-packages.nix+2−2 pkgs/applications/editors/emacs/generic.nix+2−2 pkgs/applications/editors/emacs/macport.nix+2−2 pkgs/applications/editors/featherpad/default.nix+2−2 pkgs/applications/editors/focuswriter/default.nix+2−2 pkgs/applications/editors/geany/default.nix+2−2 pkgs/applications/editors/ghostwriter/default.nix+2−2 pkgs/applications/editors/gnome-builder/default.nix+2−2 pkgs/applications/editors/gnome-latex/default.nix+2−2 pkgs/applications/editors/gobby/default.nix+2−2 pkgs/applications/editors/howl/default.nix+2−2 pkgs/applications/editors/jucipp/default.nix+2−2 pkgs/applications/editors/kakoune/default.nix+2−2 pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix+2−2 pkgs/applications/editors/kdevelop5/kdevelop.nix+2−2 pkgs/applications/editors/leafpad/default.nix+2−2 pkgs/applications/editors/mg/default.nix+3−3 pkgs/applications/editors/monodevelop/default.nix+2−2 pkgs/applications/editors/neovim/default.nix+2−2 pkgs/applications/editors/notepadqq/default.nix+2−2 pkgs/applications/editors/quilter/default.nix+2−2 pkgs/applications/editors/scite/default.nix+2−2 pkgs/applications/editors/sigil/default.nix+2−2 pkgs/applications/editors/supertux-editor/default.nix+2−2 pkgs/applications/editors/texmacs/default.nix+2−2 pkgs/applications/editors/texmaker/default.nix+2−2 pkgs/applications/editors/texstudio/default.nix+2−2 pkgs/applications/editors/textadept/10/default.nix+2−2 pkgs/applications/editors/textadept/11/default.nix+2−2 pkgs/applications/editors/tiled/default.nix+2−2 pkgs/applications/editors/vim/configurable.nix+2−2 pkgs/applications/editors/vim/default.nix+2−2 pkgs/applications/editors/vim/macvim.nix+2−2 pkgs/applications/editors/vis/default.nix+2−2 pkgs/applications/gis/grass/default.nix+2−2 pkgs/applications/graphics/ImageMagick/7.0.nix+3−3 pkgs/applications/graphics/ImageMagick/default.nix+6−6 pkgs/applications/graphics/ahoviewer/default.nix+2−2 pkgs/applications/graphics/akira/default.nix+2−2 pkgs/applications/graphics/autotrace/default.nix+2−2 pkgs/applications/graphics/darktable/default.nix+2−2 pkgs/applications/graphics/dia/default.nix+2−2 pkgs/applications/graphics/displaycal/default.nix+2−2 pkgs/applications/graphics/djview/default.nix+2−2 pkgs/applications/graphics/drawing/default.nix+2−2 pkgs/applications/graphics/epeg/default.nix+2−2 pkgs/applications/graphics/exrdisplay/default.nix+2−2 pkgs/applications/graphics/exrtools/default.nix+2−2 pkgs/applications/graphics/fbida/default.nix+2−2 pkgs/applications/graphics/fondo/default.nix+2−2 pkgs/applications/graphics/freecad/default.nix+2−2 pkgs/applications/graphics/gcolor2/default.nix+2−2 pkgs/applications/graphics/geeqie/default.nix+2−2 pkgs/applications/graphics/gimp/default.nix+2−2 pkgs/applications/graphics/glabels/default.nix+2−2 pkgs/applications/graphics/gnome-photos/default.nix+2−2 pkgs/applications/graphics/gnuclad/default.nix+2−2 pkgs/applications/graphics/goxel/default.nix+2−2 pkgs/applications/graphics/gpicview/default.nix+2−2 pkgs/applications/graphics/gqview/default.nix+3−3 pkgs/applications/graphics/grafx2/default.nix+2−2 pkgs/applications/graphics/gthumb/default.nix+2−2 pkgs/applications/graphics/guetzli/default.nix+2−2 pkgs/applications/graphics/hugin/default.nix+2−2 pkgs/applications/graphics/ideogram/default.nix+2−2 pkgs/applications/graphics/imv/default.nix+2−2 pkgs/applications/graphics/ipe/default.nix+2−2 pkgs/applications/graphics/k3d/default.nix+2−2 pkgs/applications/graphics/kgraphviewer/default.nix+2−2 pkgs/applications/graphics/ktikz/default.nix+2−2 pkgs/applications/graphics/luminance-hdr/default.nix+2−2 pkgs/applications/graphics/mozjpeg/default.nix+2−2 pkgs/applications/graphics/mypaint/default.nix+2−2 pkgs/applications/graphics/nomacs/default.nix+2−2 pkgs/applications/graphics/openimageio/2.x.nix+1−1 pkgs/applications/graphics/openscad/default.nix+2−2 pkgs/applications/graphics/opentoonz/default.nix+2−2 pkgs/applications/graphics/photivo/default.nix+2−2 pkgs/applications/graphics/photoflow/default.nix+2−2 pkgs/applications/graphics/pqiv/default.nix+2−2 pkgs/applications/graphics/qcomicbook/default.nix+2−2 pkgs/applications/graphics/qimgv/default.nix+2−2 pkgs/applications/graphics/qiv/default.nix+2−2 pkgs/applications/graphics/rawtherapee/default.nix+2−2 pkgs/applications/graphics/renderdoc/default.nix+2−2 pkgs/applications/graphics/sane/backends/generic.nix+2−2 pkgs/applications/graphics/sane/frontends.nix+2−2 pkgs/applications/graphics/sane/xsane.nix+2−2 pkgs/applications/graphics/shotwell/default.nix+2−2 pkgs/applications/graphics/solvespace/default.nix+2−2 pkgs/applications/graphics/synfigstudio/default.nix+3−3 pkgs/applications/graphics/tesseract/tesseract3.nix+2−2 pkgs/applications/graphics/tesseract/tesseract4.nix+2−2 pkgs/applications/graphics/viewnior/default.nix+2−2 pkgs/applications/graphics/xournal/default.nix+2−2 pkgs/applications/graphics/xzgv/default.nix+2−2 pkgs/applications/graphics/yacreader/default.nix+2−2 pkgs/applications/graphics/zgv/default.nix+2−2 pkgs/applications/networking/browsers/asuka/default.nix+2−2 pkgs/applications/networking/browsers/chromium/common.nix+2−2 pkgs/applications/networking/browsers/elinks/default.nix+2−2 pkgs/applications/networking/browsers/eolie/default.nix+2−2 pkgs/applications/networking/browsers/ephemeral/default.nix+2−2 pkgs/applications/networking/browsers/falkon/default.nix+2−2 pkgs/applications/networking/browsers/links2/default.nix+2−2 pkgs/applications/networking/browsers/midori/default.nix+2−2 pkgs/applications/networking/browsers/netsurf/browser.nix+2−2 pkgs/applications/networking/browsers/netsurf/libcss.nix+2−2 pkgs/applications/networking/browsers/netsurf/libdom.nix+2−2 pkgs/applications/networking/browsers/netsurf/libhubbub.nix+2−2 pkgs/applications/networking/browsers/netsurf/libnsbmp.nix+2−2 pkgs/applications/networking/browsers/netsurf/libnsfb.nix+2−2 pkgs/applications/networking/browsers/netsurf/libnsgif.nix+2−2 pkgs/applications/networking/browsers/netsurf/libnslog.nix+2−2 pkgs/applications/networking/browsers/netsurf/libnspsl.nix+2−2 pkgs/applications/networking/browsers/netsurf/libnsutils.nix+2−2 pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix+2−2 pkgs/applications/networking/browsers/netsurf/libutf8proc.nix+2−2 pkgs/applications/networking/browsers/surf/default.nix+2−2 pkgs/applications/networking/browsers/vimb/default.nix+2−2 pkgs/applications/networking/browsers/webbrowser/default.nix+2−2 pkgs/applications/networking/compactor/default.nix+2−2 pkgs/applications/networking/dropbox/cli.nix+2−2 pkgs/applications/networking/linssid/default.nix+2−2 pkgs/applications/networking/mpop/default.nix+2−2 pkgs/applications/networking/msmtp/default.nix+2−2 pkgs/applications/networking/mumble/default.nix+2−2 pkgs/applications/networking/newsreaders/pan/default.nix+2−2 pkgs/applications/networking/nym/default.nix+2−2 pkgs/applications/networking/owncloud-client/default.nix+2−2 pkgs/applications/networking/p2p/eiskaltdcpp/default.nix+2−2 pkgs/applications/networking/p2p/gnunet/default.nix+2−2 pkgs/applications/networking/p2p/ncdc/default.nix+2−2 pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2 pkgs/applications/networking/p2p/retroshare/default.nix+2−2 pkgs/applications/networking/p2p/synapse-bt/default.nix+2−2 pkgs/applications/networking/p2p/torrential/default.nix+2−2 pkgs/applications/networking/p2p/transgui/default.nix+2−2 pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix+2−2 pkgs/applications/networking/p2p/transmission/default.nix+2−2 pkgs/applications/networking/p2p/twister/default.nix+2−2 pkgs/applications/networking/remote/freerdp/default.nix+2−2 pkgs/applications/networking/remote/putty/default.nix+2−2 pkgs/applications/networking/remote/rdesktop/default.nix+2−2 pkgs/applications/networking/remote/remmina/default.nix+2−2 pkgs/applications/networking/remote/x2goclient/default.nix+2−2 pkgs/applications/networking/remote/xrdp/default.nix+3−3 pkgs/applications/networking/sniffers/etherape/default.nix+2−2 pkgs/applications/networking/sniffers/ettercap/default.nix+2−2 pkgs/applications/networking/sniffers/kismet/default.nix+2−2 pkgs/applications/networking/sniffers/wireshark/default.nix+2−2 pkgs/applications/networking/sniproxy/default.nix+2−2 pkgs/applications/networking/sync/casync/default.nix+2−2 pkgs/applications/networking/sync/lsyncd/default.nix+2−2 pkgs/applications/networking/sync/onedrive/default.nix+2−2 pkgs/applications/networking/vnstat/default.nix+2−2 pkgs/applications/networking/weather/meteo/default.nix+2−2 pkgs/applications/networking/znc/default.nix+2−2 pkgs/applications/science/astronomy/celestia/default.nix+2−2 pkgs/applications/science/astronomy/gildas/default.nix+2−2 pkgs/applications/science/astronomy/gpredict/default.nix+2−2 pkgs/applications/science/astronomy/xplanet/default.nix+2−2 pkgs/applications/science/biology/EZminc/default.nix+2−2 pkgs/applications/science/biology/exonerate/default.nix+2−2 pkgs/applications/science/biology/neuron/default.nix+2−2 pkgs/applications/science/biology/sortmerna/default.nix+2−2 pkgs/applications/science/biology/vcftools/default.nix+2−2 pkgs/applications/science/chemistry/avogadro/default.nix+2−2 pkgs/applications/science/electronics/dsview/default.nix+2−2 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix+2−2 pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix+2−2 pkgs/applications/science/electronics/fped/default.nix+2−2 pkgs/applications/science/electronics/fritzing/default.nix+2−2 pkgs/applications/science/electronics/geda/default.nix+2−2 pkgs/applications/science/electronics/gerbv/default.nix+2−2 pkgs/applications/science/electronics/gtkwave/default.nix+2−2 pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix+2−2 pkgs/applications/science/electronics/horizon-eda/default.nix+2−2 pkgs/applications/science/electronics/hyp2mat/default.nix+2−2 pkgs/applications/science/electronics/kicad/base.nix+2−2 pkgs/applications/science/electronics/pcb/default.nix+2−2 pkgs/applications/science/electronics/pulseview/default.nix+2−2 pkgs/applications/science/electronics/xcircuit/default.nix+2−2 pkgs/applications/science/electronics/xoscope/default.nix+2−2 pkgs/applications/science/geometry/drgeo/default.nix+2−2 pkgs/applications/science/logic/coq/default.nix+2−2 pkgs/applications/science/logic/cvc4/default.nix+2−2 pkgs/applications/science/logic/elan/default.nix+2−2 pkgs/applications/science/logic/ott/default.nix+2−2 pkgs/applications/science/logic/prooftree/default.nix+2−2 pkgs/applications/science/logic/twelf/default.nix+2−2 pkgs/applications/science/math/R/default.nix+2−2 pkgs/applications/science/math/cemu/default.nix+2−2 pkgs/applications/science/math/ginac/default.nix+2−2 pkgs/applications/science/math/nasc/default.nix+2−2 pkgs/applications/science/math/pspp/default.nix+2−2 pkgs/applications/science/math/pynac/default.nix+2−2 pkgs/applications/science/math/qalculate-gtk/default.nix+2−2 pkgs/applications/science/math/rofi-calc/default.nix+2−2 pkgs/applications/science/math/sage/default.nix+3−3 pkgs/applications/science/math/singular/default.nix+2−2 pkgs/applications/science/misc/boinc/default.nix+2−2 pkgs/applications/science/misc/openmodelica/default.nix+2−2 pkgs/applications/science/misc/openmvg/default.nix+2−2 pkgs/applications/science/misc/openmvs/default.nix+2−2 pkgs/applications/science/misc/root/default.nix+2−2 pkgs/applications/science/robotics/qgroundcontrol/default.nix+2−2 pkgs/applications/terminal-emulators/alacritty/default.nix+2−2 pkgs/applications/terminal-emulators/eterm/default.nix+2−2 pkgs/applications/terminal-emulators/evilvte/default.nix+2−2 pkgs/applications/terminal-emulators/havoc/default.nix+2−2 pkgs/applications/terminal-emulators/kitty/default.nix+2−2 pkgs/applications/terminal-emulators/lilyterm/default.nix+2−2 pkgs/applications/terminal-emulators/lxterminal/default.nix+2−2 pkgs/applications/terminal-emulators/mlterm/default.nix+2−2 pkgs/applications/terminal-emulators/mrxvt/default.nix+2−2 pkgs/applications/terminal-emulators/roxterm/default.nix+2−2 pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix+2−2 pkgs/applications/terminal-emulators/rxvt-unicode/default.nix+2−2 pkgs/applications/terminal-emulators/rxvt/default.nix+2−2 pkgs/applications/terminal-emulators/sakura/default.nix+2−2 pkgs/applications/terminal-emulators/st/default.nix+2−2 pkgs/applications/terminal-emulators/st/xst.nix+2−2 pkgs/applications/terminal-emulators/stupidterm/default.nix+3−3 pkgs/applications/terminal-emulators/termite/default.nix+2−2 pkgs/applications/terminal-emulators/tilix/default.nix+2−2 pkgs/applications/terminal-emulators/wayst/default.nix+2−2 pkgs/applications/terminal-emulators/xterm/default.nix+2−2 pkgs/applications/version-management/bitkeeper/default.nix+2−2 pkgs/applications/version-management/git-and-tools/cgit/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-dit/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-gone/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-ignore/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-workspace/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git/default.nix+2−2 pkgs/applications/version-management/git-and-tools/gitin/default.nix+2−2 pkgs/applications/version-management/git-and-tools/grv/default.nix+2−2 pkgs/applications/version-management/git-and-tools/tig/default.nix+2−2 pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2 pkgs/applications/version-management/gitoxide/default.nix+1−1 pkgs/applications/version-management/gource/default.nix+2−2 pkgs/applications/version-management/guitone/default.nix+2−2 pkgs/applications/version-management/monotone-viz/default.nix+3−3 pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix+2−2 pkgs/applications/version-management/monotone/default.nix+2−2 pkgs/applications/window-managers/afterstep/default.nix+3−3 pkgs/applications/window-managers/awesome/default.nix+2−2 pkgs/applications/window-managers/cwm/default.nix+2−2 pkgs/applications/window-managers/dwm/dwm-status.nix+2−2 pkgs/applications/window-managers/dzen2/default.nix+2−2 pkgs/applications/window-managers/fbpanel/default.nix+2−2 pkgs/applications/window-managers/fluxbox/default.nix+2−2 pkgs/applications/window-managers/fvwm/default.nix+2−2 pkgs/applications/window-managers/herbstluftwm/default.nix+2−2 pkgs/applications/window-managers/hikari/default.nix+2−2 pkgs/applications/window-managers/i3/easyfocus.nix+2−2 pkgs/applications/window-managers/i3/i3ipc-glib.nix+2−2 pkgs/applications/window-managers/i3/lock-color.nix+2−2 pkgs/applications/window-managers/i3/lock.nix+2−2 pkgs/applications/window-managers/i3/status-rust.nix+2−2 pkgs/applications/window-managers/i3/status.nix+2−2 pkgs/applications/window-managers/i3/wmfocus.nix+2−2 pkgs/applications/window-managers/jwm/default.nix+2−2 pkgs/applications/window-managers/jwm/jwm-settings-manager.nix+2−2 pkgs/applications/window-managers/kbdd/default.nix+2−2 pkgs/applications/window-managers/matchbox/default.nix+2−2 pkgs/applications/window-managers/neocomp/default.nix+2−2 pkgs/applications/window-managers/notion/default.nix+2−2 pkgs/applications/window-managers/openbox/default.nix+2−2 pkgs/applications/window-managers/oroborus/default.nix+2−2 pkgs/applications/window-managers/qtile/default.nix+2−2 pkgs/applications/window-managers/ratpoison/default.nix+2−2 pkgs/applications/window-managers/spectrwm/default.nix+2−2 pkgs/applications/window-managers/sway/bg.nix+2−2 pkgs/applications/window-managers/sway/idle.nix+2−2 pkgs/applications/window-managers/sway/lock-effects.nix+2−2 pkgs/applications/window-managers/sway/lock.nix+2−2 pkgs/applications/window-managers/trayer/default.nix+2−2 pkgs/applications/window-managers/vwm/default.nix+2−2 pkgs/applications/window-managers/windowlab/default.nix+2−2 pkgs/applications/window-managers/windowmaker/default.nix+2−2 pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix+2−2 pkgs/applications/window-managers/wmii-hg/default.nix+2−2 pkgs/applications/window-managers/xmonad/log-applet/default.nix+2−2 pkgs/applications/window-managers/yabar/build.nix+2−2 pkgs/build-support/build-dotnet-package/default.nix+2−2 pkgs/build-support/build-fhs-userenv/chrootenv/default.nix+2−2 pkgs/build-support/dotnetbuildhelpers/default.nix+2−2 pkgs/build-support/writers/default.nix+1−1 pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix+2−2 pkgs/development/compilers/bluespec/default.nix+2−2 pkgs/development/compilers/crystal/build-package.nix+2−2 pkgs/development/compilers/crystal/default.nix+3−3 pkgs/development/compilers/dtc/default.nix+2−2 pkgs/development/compilers/factor-lang/default.nix+2−2 pkgs/development/compilers/flux/default.nix+2−2 pkgs/development/compilers/fsharp/default.nix+2−2 pkgs/development/compilers/fsharp41/default.nix+2−2 pkgs/development/compilers/gcc/4.8/default.nix+2−2 pkgs/development/compilers/gcc/4.9/default.nix+2−2 pkgs/development/compilers/gcc/6/default.nix+2−2 pkgs/development/compilers/ghcjs-ng/default.nix+2−2 pkgs/development/compilers/gnu-smalltalk/default.nix+2−2 pkgs/development/compilers/go/1.14.nix+2−2 pkgs/development/compilers/go/1.15.nix+2−2 pkgs/development/compilers/go/1.4.nix+2−2 pkgs/development/compilers/go/2-dev.nix+2−2 pkgs/development/compilers/intel-graphics-compiler/default.nix+1−1 pkgs/development/compilers/intercal/default.nix+2−2 pkgs/development/compilers/neko/default.nix+2−2 pkgs/development/compilers/openjdk/11.nix+2−2 pkgs/development/compilers/openjdk/12.nix+2−2 pkgs/development/compilers/openjdk/13.nix+2−2 pkgs/development/compilers/openjdk/8.nix+2−2 pkgs/development/compilers/openjdk/openjfx/11.nix+2−2 pkgs/development/compilers/openjdk/openjfx/15.nix+2−2 pkgs/development/compilers/rust/cargo.nix+2−2 pkgs/development/compilers/rust/rls/default.nix+2−2 pkgs/development/compilers/rust/rustc.nix+2−2 pkgs/development/compilers/sagittarius-scheme/default.nix+2−2 pkgs/development/compilers/squeak/default.nix+2−2 pkgs/development/compilers/swi-prolog/default.nix+2−2 pkgs/development/compilers/swift/default.nix+3−3 pkgs/development/compilers/vala/default.nix+2−2 pkgs/development/guile-modules/guile-cairo/default.nix+2−2 pkgs/development/guile-modules/guile-fibers/default.nix+2−2 pkgs/development/guile-modules/guile-gnome/default.nix+2−2 pkgs/development/guile-modules/guile-lib/default.nix+2−2 pkgs/development/guile-modules/guile-ncurses/default.nix+2−2 pkgs/development/guile-modules/guile-opengl/default.nix+2−2 pkgs/development/guile-modules/guile-reader/default.nix+2−2 pkgs/development/guile-modules/guile-sdl/default.nix+2−2 pkgs/development/guile-modules/guile-sdl2/default.nix+2−2 pkgs/development/guile-modules/guile-xcb/default.nix+2−2 pkgs/development/haskell-modules/configuration-nix.nix+1−1 pkgs/development/haskell-modules/generic-builder.nix+7−7 pkgs/development/haskell-modules/generic-stack-builder.nix+2−2 pkgs/development/haskell-modules/lib.nix+1−1 pkgs/development/idris-modules/glfw.nix+1−1 pkgs/development/idris-modules/sdl2.nix+2−2 pkgs/development/interpreters/evcxr/default.nix+2−2 pkgs/development/interpreters/falcon/default.nix+2−2 pkgs/development/interpreters/gtk-server/default.nix+2−2 pkgs/development/interpreters/guile/1.8.nix+2−2 pkgs/development/interpreters/guile/2.0.nix+2−2 pkgs/development/interpreters/guile/default.nix+2−2 pkgs/development/interpreters/io/default.nix+2−2 pkgs/development/interpreters/lolcode/default.nix+2−2 pkgs/development/interpreters/love/0.10.nix+2−2 pkgs/development/interpreters/love/0.7.nix+2−2 pkgs/development/interpreters/love/0.8.nix+2−2 pkgs/development/interpreters/love/0.9.nix+2−2 pkgs/development/interpreters/love/11.1.nix+2−2 pkgs/development/interpreters/micropython/default.nix+2−2 pkgs/development/interpreters/nix-exec/default.nix+2−2 pkgs/development/interpreters/octave/default.nix+2−2 pkgs/development/interpreters/php/generic.nix+2−2 pkgs/development/interpreters/pixie/default.nix+2−2 pkgs/development/interpreters/python/pypy/default.nix+2−2 pkgs/development/interpreters/qnial/default.nix+2−2 pkgs/development/interpreters/renpy/default.nix+2−2 pkgs/development/interpreters/spidermonkey/1.8.5.nix+2−2 pkgs/development/interpreters/spidermonkey/38.nix+2−2 pkgs/development/interpreters/spidermonkey/60.nix+2−2 pkgs/development/interpreters/spidermonkey/68.nix+2−2 pkgs/development/interpreters/spidermonkey/78.nix+2−2 pkgs/development/interpreters/supercollider/default.nix+2−2 pkgs/development/libraries/SDL/default.nix+2−2 pkgs/development/libraries/SDL2/default.nix+3−3 pkgs/development/libraries/SDL_Pango/default.nix+2−2 pkgs/development/libraries/SDL_sixel/default.nix+2−2 pkgs/development/libraries/Xaw3d/default.nix+2−2 pkgs/development/libraries/accounts-qt/default.nix+2−2 pkgs/development/libraries/accountsservice/default.nix+2−2 pkgs/development/libraries/ace/default.nix+2−2 pkgs/development/libraries/agg/default.nix+2−2 pkgs/development/libraries/allegro/5.nix+2−2 pkgs/development/libraries/amdvlk/default.nix+2−2 pkgs/development/libraries/amtk/default.nix+2−2 pkgs/development/libraries/appstream-glib/default.nix+2−2 pkgs/development/libraries/appstream/default.nix+2−2 pkgs/development/libraries/aqbanking/default.nix+2−2 pkgs/development/libraries/aqbanking/gwenhywfar.nix+2−2 pkgs/development/libraries/aqbanking/libchipcard.nix+2−2 pkgs/development/libraries/aravis/default.nix+2−2 pkgs/development/libraries/aribb25/default.nix+2−2 pkgs/development/libraries/arrayfire/default.nix+2−2 pkgs/development/libraries/at-spi2-atk/default.nix+2−2 pkgs/development/libraries/at-spi2-core/default.nix+2−2 pkgs/development/libraries/atk/default.nix+2−2 pkgs/development/libraries/atkmm/default.nix+2−2 pkgs/development/libraries/aubio/default.nix+2−2 pkgs/development/libraries/audio/libbs2b/default.nix+2−2 pkgs/development/libraries/audio/libsmf/default.nix+2−2 pkgs/development/libraries/audio/lilv/default.nix+2−2 pkgs/development/libraries/audio/lv2/default.nix+2−2 pkgs/development/libraries/audio/lvtk/default.nix+2−2 pkgs/development/libraries/audio/ntk/default.nix+2−2 pkgs/development/libraries/audio/raul/default.nix+2−2 pkgs/development/libraries/audio/rtmidi/default.nix+2−2 pkgs/development/libraries/audio/sratom/default.nix+2−2 pkgs/development/libraries/audio/suil/default.nix+2−2 pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix+2−2 pkgs/development/libraries/avahi/default.nix+3−3 pkgs/development/libraries/avro-c/default.nix+2−2 pkgs/development/libraries/babl/default.nix+2−2 pkgs/development/libraries/bamf/default.nix+2−2 pkgs/development/libraries/beignet/default.nix+3−3 pkgs/development/libraries/biblesync/default.nix+2−2 pkgs/development/libraries/boehm-gc/7.6.6.nix+2−2 pkgs/development/libraries/boolstuff/default.nix+2−2 pkgs/development/libraries/cairo/default.nix+2−2 pkgs/development/libraries/cairomm/default.nix+2−2 pkgs/development/libraries/capstone/default.nix+2−2 pkgs/development/libraries/ccrtp/default.nix+2−2 pkgs/development/libraries/clutter-gst/default.nix+2−2 pkgs/development/libraries/clutter-gtk/default.nix+2−2 pkgs/development/libraries/clutter/default.nix+2−2 pkgs/development/libraries/cmrt/default.nix+2−2 pkgs/development/libraries/cogl/default.nix+2−2 pkgs/development/libraries/cre2/default.nix+2−2 pkgs/development/libraries/ctl/default.nix+2−2 pkgs/development/libraries/ctpl/default.nix+2−2 pkgs/development/libraries/ctypes_sh/default.nix+2−2 pkgs/development/libraries/cutelyst/default.nix+2−2 pkgs/development/libraries/cwiid/default.nix+2−2 pkgs/development/libraries/dav1d/default.nix+2−2 pkgs/development/libraries/dbus-cplusplus/default.nix+2−2 pkgs/development/libraries/dbus-glib/default.nix+2−2 pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix+2−2 pkgs/development/libraries/dbus-sharp-glib/default.nix+2−2 pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix+2−2 pkgs/development/libraries/dbus-sharp/default.nix+2−2 pkgs/development/libraries/dbus/default.nix+2−2 pkgs/development/libraries/dee/default.nix+2−2 pkgs/development/libraries/directfb/default.nix+2−2 pkgs/development/libraries/dleyna-connector-dbus/default.nix+2−2 pkgs/development/libraries/dleyna-core/default.nix+2−2 pkgs/development/libraries/dleyna-renderer/default.nix+2−2 pkgs/development/libraries/dleyna-server/default.nix+2−2 pkgs/development/libraries/dlib/default.nix+2−2 pkgs/development/libraries/dqlite/default.nix+2−2 pkgs/development/libraries/dssi/default.nix+2−2 pkgs/development/libraries/dxflib/default.nix+1−1 pkgs/development/libraries/egl-wayland/default.nix+2−2 pkgs/development/libraries/elementary-cmake-modules/default.nix+2−2 pkgs/development/libraries/embree/default.nix+2−2 pkgs/development/libraries/enchant/1.x.nix+2−2 pkgs/development/libraries/epoxy/default.nix+2−2 pkgs/development/libraries/exosip/default.nix+2−2 pkgs/development/libraries/farstream/default.nix+2−2 pkgs/development/libraries/fflas-ffpack/default.nix+2−2 pkgs/development/libraries/ffmpeg-full/default.nix+2−2 pkgs/development/libraries/ffmpeg-sixel/default.nix+2−2 pkgs/development/libraries/ffmpeg/generic.nix+2−2 pkgs/development/libraries/ffms/default.nix+2−2 pkgs/development/libraries/fltk/1.4.nix+2−2 pkgs/development/libraries/fltk/default.nix+2−2 pkgs/development/libraries/folks/default.nix+2−2 pkgs/development/libraries/forge/default.nix+2−2 pkgs/development/libraries/frame/default.nix+2−2 pkgs/development/libraries/freenect/default.nix+2−2 pkgs/development/libraries/freetds/default.nix+2−2 pkgs/development/libraries/freetype/default.nix+3−3 pkgs/development/libraries/frei0r/default.nix+2−2 pkgs/development/libraries/fribidi/default.nix+2−2 pkgs/development/libraries/fstrm/default.nix+2−2 pkgs/development/libraries/gaia/default.nix+2−2 pkgs/development/libraries/gamin/default.nix+2−2 pkgs/development/libraries/ganv/default.nix+2−2 pkgs/development/libraries/gcab/default.nix+2−2 pkgs/development/libraries/gcr/default.nix+2−2 pkgs/development/libraries/gdata-sharp/default.nix+2−2 pkgs/development/libraries/gdl/default.nix+2−2 pkgs/development/libraries/gdome2/default.nix+2−2 pkgs/development/libraries/gegl/4.0.nix+2−2 pkgs/development/libraries/gegl/default.nix+2−2 pkgs/development/libraries/geis/default.nix+2−2 pkgs/development/libraries/geoclue/default.nix+2−2 pkgs/development/libraries/geocode-glib/default.nix+2−2 pkgs/development/libraries/gexiv2/default.nix+2−2 pkgs/development/libraries/gfbgraph/default.nix+2−2 pkgs/development/libraries/gio-sharp/default.nix+2−2 pkgs/development/libraries/gjs/default.nix+2−2 pkgs/development/libraries/glib-networking/default.nix+2−2 pkgs/development/libraries/glib-testing/default.nix+2−2 pkgs/development/libraries/glib/default.nix+3−3 pkgs/development/libraries/glibmm/default.nix+2−2 pkgs/development/libraries/globalplatform/default.nix+2−2 pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix+2−2 pkgs/development/libraries/gmime/2.nix+2−2 pkgs/development/libraries/gmime/3.nix+2−2 pkgs/development/libraries/gmtk/default.nix+2−2 pkgs/development/libraries/gnet/default.nix+2−2 pkgs/development/libraries/gnome-menus/default.nix+2−2 pkgs/development/libraries/gnome-sharp/default.nix+2−2 pkgs/development/libraries/gnome-video-effects/default.nix+2−2 pkgs/development/libraries/gnutls-kdh/generic.nix+3−3 pkgs/development/libraries/gnutls/default.nix+4−4 pkgs/development/libraries/goffice/default.nix+2−2 pkgs/development/libraries/gom/default.nix+2−2 pkgs/development/libraries/goocanvas/2.x.nix+2−2 pkgs/development/libraries/goocanvas/default.nix+2−2 pkgs/development/libraries/goocanvasmm/default.nix+2−2 pkgs/development/libraries/gpgme/default.nix+2−2 pkgs/development/libraries/grail/default.nix+2−2 pkgs/development/libraries/graphene/default.nix+2−2 pkgs/development/libraries/grilo-plugins/default.nix+2−2 pkgs/development/libraries/grilo/default.nix+2−2 pkgs/development/libraries/gsettings-desktop-schemas/default.nix+2−2 pkgs/development/libraries/gsettings-qt/default.nix+2−2 pkgs/development/libraries/gsignond/default.nix+2−2 pkgs/development/libraries/gsignond/plugins/lastfm.nix+2−2 pkgs/development/libraries/gsignond/plugins/mail.nix+2−2 pkgs/development/libraries/gsignond/plugins/oauth.nix+2−2 pkgs/development/libraries/gsignond/plugins/sasl.nix+2−2 pkgs/development/libraries/gsound/default.nix+2−2 pkgs/development/libraries/gspell/default.nix+3−3 pkgs/development/libraries/gssdp/default.nix+2−2 pkgs/development/libraries/gstreamer/bad/default.nix+2−2 pkgs/development/libraries/gstreamer/base/default.nix+2−2 pkgs/development/libraries/gstreamer/core/default.nix+3−3 pkgs/development/libraries/gstreamer/devtools/default.nix+2−2 pkgs/development/libraries/gstreamer/ges/default.nix+2−2 pkgs/development/libraries/gstreamer/good/default.nix+2−2 pkgs/development/libraries/gstreamer/gstreamermm/default.nix+2−2 pkgs/development/libraries/gstreamer/libav/default.nix+2−2 pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2 pkgs/development/libraries/gstreamer/ugly/default.nix+2−2 pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2 pkgs/development/libraries/gtdialog/default.nix+2−2 pkgs/development/libraries/gtk-engine-bluecurve/default.nix+2−2 pkgs/development/libraries/gtk-engine-murrine/default.nix+2−2 pkgs/development/libraries/gtk-engines/default.nix+2−2 pkgs/development/libraries/gtk-mac-integration/default.nix+2−2 pkgs/development/libraries/gtk-sharp-beans/default.nix+2−2 pkgs/development/libraries/gtk-sharp/2.0.nix+2−2 pkgs/development/libraries/gtk-sharp/3.0.nix+2−2 pkgs/development/libraries/gtk/2.x.nix+2−2 pkgs/development/libraries/gtk/3.x.nix+2−2 pkgs/development/libraries/gtkd/default.nix+3−3 pkgs/development/libraries/gtkdatabox/default.nix+2−2 pkgs/development/libraries/gtkimageview/default.nix+2−2 pkgs/development/libraries/gtkmathview/default.nix+2−2 pkgs/development/libraries/gtkmm/2.x.nix+2−2 pkgs/development/libraries/gtkmm/3.x.nix+2−2 pkgs/development/libraries/gtksourceview/3.x.nix+2−2 pkgs/development/libraries/gtksourceview/4.x.nix+2−2 pkgs/development/libraries/gtksourceviewmm/4.x.nix+2−2 pkgs/development/libraries/gtksourceviewmm/default.nix+2−2 pkgs/development/libraries/gtkspell/3.nix+2−2 pkgs/development/libraries/gtkspell/default.nix+2−2 pkgs/development/libraries/gtkspellmm/default.nix+2−2 pkgs/development/libraries/gts/default.nix+2−2 pkgs/development/libraries/gupnp-av/default.nix+2−2 pkgs/development/libraries/gupnp-dlna/default.nix+2−2 pkgs/development/libraries/gupnp-igd/default.nix+2−2 pkgs/development/libraries/gupnp/default.nix+2−2 pkgs/development/libraries/gusb/default.nix+2−2 pkgs/development/libraries/gvfs/default.nix+2−2 pkgs/development/libraries/hamlib/default.nix+2−2 pkgs/development/libraries/harfbuzz/default.nix+2−2 pkgs/development/libraries/hidapi/default.nix+2−2 pkgs/development/libraries/hivex/default.nix+2−2 pkgs/development/libraries/hwloc/default.nix+2−2 pkgs/development/libraries/hyena/default.nix+2−2 pkgs/development/libraries/hyperscan/default.nix+2−2 pkgs/development/libraries/igraph/default.nix+2−2 pkgs/development/libraries/iksemel/default.nix+2−2 pkgs/development/libraries/ilixi/default.nix+2−2 pkgs/development/libraries/imlib2/default.nix+2−2 pkgs/development/libraries/indicator-application/gtk2.nix+2−2 pkgs/development/libraries/indicator-application/gtk3.nix+2−2 pkgs/development/libraries/intel-media-sdk/default.nix+2−2 pkgs/development/libraries/itk/default.nix+2−2 pkgs/development/libraries/java/swt/default.nix+2−2 pkgs/development/libraries/jose/default.nix+2−2 pkgs/development/libraries/json-glib/default.nix+2−2 pkgs/development/libraries/jsonrpc-glib/default.nix+2−2 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix+2−2 pkgs/development/libraries/kerberos/heimdal.nix+2−2 pkgs/development/libraries/kerberos/krb5.nix+2−2 pkgs/development/libraries/keybinder/default.nix+2−2 pkgs/development/libraries/keybinder3/default.nix+2−2 pkgs/development/libraries/kmsxx/default.nix+2−2 pkgs/development/libraries/languagemachines/frog.nix+2−2 pkgs/development/libraries/languagemachines/frogdata.nix+2−2 pkgs/development/libraries/languagemachines/libfolia.nix+2−2 pkgs/development/libraries/languagemachines/mbt.nix+2−2 pkgs/development/libraries/languagemachines/ticcutils.nix+2−2 pkgs/development/libraries/languagemachines/timbl.nix+2−2 pkgs/development/libraries/languagemachines/timblserver.nix+2−2 pkgs/development/libraries/languagemachines/ucto.nix+2−2 pkgs/development/libraries/languagemachines/uctodata.nix+2−2 pkgs/development/libraries/lasem/default.nix+2−2 pkgs/development/libraries/lasso/default.nix+2−2 pkgs/development/libraries/leptonica/default.nix+2−2 pkgs/development/libraries/libabigail/default.nix+2−2 pkgs/development/libraries/libabw/default.nix+2−2 pkgs/development/libraries/libaccounts-glib/default.nix+2−2 pkgs/development/libraries/libagar/default.nix+2−2 pkgs/development/libraries/libao/default.nix+2−2 pkgs/development/libraries/libaom/default.nix+2−2 pkgs/development/libraries/libaosd/default.nix+2−2 pkgs/development/libraries/libappindicator/default.nix+2−2 pkgs/development/libraries/libarchive/default.nix+3−3 pkgs/development/libraries/libass/default.nix+2−2 pkgs/development/libraries/libast/default.nix+2−2 pkgs/development/libraries/libaudclient/default.nix+2−2 pkgs/development/libraries/libav/default.nix+2−2 pkgs/development/libraries/libavc1394/default.nix+2−2 pkgs/development/libraries/libblockdev/default.nix+2−2 pkgs/development/libraries/libbluray/default.nix+2−2 pkgs/development/libraries/libbytesize/default.nix+2−2 pkgs/development/libraries/libcaca/default.nix+2−2 pkgs/development/libraries/libcacard/default.nix+2−2 pkgs/development/libraries/libcanberra/default.nix+2−2 pkgs/development/libraries/libcangjie/default.nix+2−2 pkgs/development/libraries/libcdio-paranoia/default.nix+2−2 pkgs/development/libraries/libcdio/default.nix+2−2 pkgs/development/libraries/libcdr/default.nix+2−2 pkgs/development/libraries/libcec/default.nix+2−2 pkgs/development/libraries/libchamplain/default.nix+2−2 pkgs/development/libraries/libchop/default.nix+2−2 pkgs/development/libraries/libcloudproviders/default.nix+2−2 pkgs/development/libraries/libclxclient/default.nix+2−2 pkgs/development/libraries/libcmis/default.nix+2−2 pkgs/development/libraries/libco-canonical/default.nix+2−2 pkgs/development/libraries/libcouchbase/default.nix+2−2 pkgs/development/libraries/libcryptui/default.nix+2−2 pkgs/development/libraries/libdazzle/default.nix+2−2 pkgs/development/libraries/libdbusmenu/default.nix+2−2 pkgs/development/libraries/libde265/default.nix+2−2 pkgs/development/libraries/libdevil/default.nix+2−2 pkgs/development/libraries/libdigidocpp/default.nix+2−2 pkgs/development/libraries/libdiscid/default.nix+2−2 pkgs/development/libraries/libdmtx/default.nix+2−2 pkgs/development/libraries/libdrm/default.nix+2−2 pkgs/development/libraries/libdvdnav/4.2.1.nix+2−2 pkgs/development/libraries/libdvdnav/default.nix+2−2 pkgs/development/libraries/libe-book/default.nix+2−2 pkgs/development/libraries/libebml/default.nix+2−2 pkgs/development/libraries/libee/default.nix+2−2 pkgs/development/libraries/libepc/default.nix+2−2 pkgs/development/libraries/libevdevplus/default.nix+2−2 pkgs/development/libraries/libewf/default.nix+2−2 pkgs/development/libraries/libextractor/default.nix+2−2 pkgs/development/libraries/libfakekey/default.nix+2−2 pkgs/development/libraries/libfido2/default.nix+2−2 pkgs/development/libraries/libfilezilla/default.nix+2−2 pkgs/development/libraries/libfishsound/default.nix+2−2 pkgs/development/libraries/libfive/default.nix+2−2 pkgs/development/libraries/libfixposix/default.nix+2−2 pkgs/development/libraries/libfm/default.nix+2−2 pkgs/development/libraries/libfprint/default.nix+2−2 pkgs/development/libraries/libfreefare/default.nix+2−2 pkgs/development/libraries/libfsm/default.nix+1−1 pkgs/development/libraries/libftdi/1.x.nix+2−2 pkgs/development/libraries/libgaminggear/default.nix+2−2 pkgs/development/libraries/libgdamm/default.nix+2−2 pkgs/development/libraries/libgdata/default.nix+2−2 pkgs/development/libraries/libgdiplus/default.nix+2−2 pkgs/development/libraries/libgee/default.nix+2−2 pkgs/development/libraries/libgepub/default.nix+2−2 pkgs/development/libraries/libgig/default.nix+2−2 pkgs/development/libraries/libgit2-glib/default.nix+2−2 pkgs/development/libraries/libgksu/default.nix+2−2 pkgs/development/libraries/libglvnd/default.nix+2−2 pkgs/development/libraries/libgnome-keyring/default.nix+2−2 pkgs/development/libraries/libgnomekbd/default.nix+2−2 pkgs/development/libraries/libgnurl/default.nix+2−2 pkgs/development/libraries/libgphoto2/default.nix+2−2 pkgs/development/libraries/libgpiod/default.nix+2−2 pkgs/development/libraries/libgringotts/default.nix+2−2 pkgs/development/libraries/libgrss/default.nix+2−2 pkgs/development/libraries/libgsf/default.nix+2−2 pkgs/development/libraries/libgtop/default.nix+2−2 pkgs/development/libraries/libgudev/default.nix+2−2 pkgs/development/libraries/libguestfs/default.nix+2−2 pkgs/development/libraries/libgweather/default.nix+2−2 pkgs/development/libraries/libgxps/default.nix+2−2 pkgs/development/libraries/libhandy/0.x.nix+2−2 pkgs/development/libraries/libhandy/default.nix+3−3 pkgs/development/libraries/libheif/default.nix+2−2 pkgs/development/libraries/libhttpseverywhere/default.nix+2−2 pkgs/development/libraries/libical/default.nix+2−2 pkgs/development/libraries/libiec61883/default.nix+2−2 pkgs/development/libraries/libimobiledevice/default.nix+2−2 pkgs/development/libraries/libindicator/default.nix+2−2 pkgs/development/libraries/libinfinity/default.nix+2−2 pkgs/development/libraries/libinput/default.nix+2−2 pkgs/development/libraries/libiodbc/default.nix+2−2 pkgs/development/libraries/libirecovery/default.nix+2−2 pkgs/development/libraries/libite/default.nix+2−2 pkgs/development/libraries/libivykis/default.nix+2−2 pkgs/development/libraries/liblangtag/default.nix+2−2 pkgs/development/libraries/liblastfm/default.nix+2−2 pkgs/development/libraries/liblastfmSF/default.nix+2−2 pkgs/development/libraries/liblcf/default.nix+2−2 pkgs/development/libraries/liblinphone/default.nix+2−2 pkgs/development/libraries/liblogging/default.nix+2−2 pkgs/development/libraries/liblognorm/default.nix+2−2 pkgs/development/libraries/liblouis/default.nix+2−2 pkgs/development/libraries/liblqr-1/default.nix+2−2 pkgs/development/libraries/liblscp/default.nix+2−2 pkgs/development/libraries/libmanette/default.nix+2−2 pkgs/development/libraries/libmatheval/default.nix+2−2 pkgs/development/libraries/libmatroska/default.nix+2−2 pkgs/development/libraries/libmediaart/default.nix+2−2 pkgs/development/libraries/libmediainfo/default.nix+2−2 pkgs/development/libraries/libmicrodns/default.nix+2−2 pkgs/development/libraries/libmicrohttpd/generic.nix+2−2 pkgs/development/libraries/libmms/default.nix+2−2 pkgs/development/libraries/libmodule/default.nix+2−2 pkgs/development/libraries/libmongo-client/default.nix+2−2 pkgs/development/libraries/libmrss/default.nix+2−2 pkgs/development/libraries/libmtp/default.nix+2−2 pkgs/development/libraries/libmwaw/default.nix+2−2 pkgs/development/libraries/libmx/default.nix+2−2 pkgs/development/libraries/libmypaint/default.nix+2−2 pkgs/development/libraries/libndctl/default.nix+2−2 pkgs/development/libraries/libnetfilter_acct/default.nix+2−2 pkgs/development/libraries/libnetfilter_conntrack/default.nix+2−2 pkgs/development/libraries/libnetfilter_cthelper/default.nix+2−2 pkgs/development/libraries/libnetfilter_cttimeout/default.nix+2−2 pkgs/development/libraries/libnetfilter_log/default.nix+2−2 pkgs/development/libraries/libnetfilter_queue/default.nix+2−2 pkgs/development/libraries/libnftnl/default.nix+2−2 pkgs/development/libraries/libnice/default.nix+2−2 pkgs/development/libraries/libnih/default.nix+2−2 pkgs/development/libraries/libnixxml/default.nix+2−2 pkgs/development/libraries/libnotify/default.nix+2−2 pkgs/development/libraries/libnsl/default.nix+2−2 pkgs/development/libraries/liboauth/default.nix+2−2 pkgs/development/libraries/libodfgen/default.nix+2−2 pkgs/development/libraries/libofx/default.nix+2−2 pkgs/development/libraries/liboggz/default.nix+2−2 pkgs/development/libraries/liboil/default.nix+2−2 pkgs/development/libraries/libopusenc/default.nix+2−2 pkgs/development/libraries/libosinfo/default.nix+2−2 pkgs/development/libraries/libow/default.nix+2−2 pkgs/development/libraries/libp11/default.nix+2−2 pkgs/development/libraries/libpar2/default.nix+2−2 pkgs/development/libraries/libpcap/default.nix+2−2 pkgs/development/libraries/libpeas/default.nix+2−2 pkgs/development/libraries/libphonenumber/default.nix+2−2 pkgs/development/libraries/libpinyin/default.nix+2−2 pkgs/development/libraries/libplist/default.nix+2−2 pkgs/development/libraries/libportal/default.nix+2−2 pkgs/development/libraries/libproxy/default.nix+2−2 pkgs/development/libraries/libpseudo/default.nix+2−2 pkgs/development/libraries/libpsl/default.nix+2−2 pkgs/development/libraries/libpst/default.nix+2−2 pkgs/development/libraries/libqalculate/default.nix+2−2 pkgs/development/libraries/libqb/default.nix+2−2 pkgs/development/libraries/libr3/default.nix+2−2 pkgs/development/libraries/libraw/default.nix+2−2 pkgs/development/libraries/librdf/rasqal.nix+2−2 pkgs/development/libraries/librdf/redland.nix+2−2 pkgs/development/libraries/librelp/default.nix+2−2 pkgs/development/libraries/librep/default.nix+2−2 pkgs/development/libraries/librest/default.nix+2−2 pkgs/development/libraries/librevenge/default.nix+2−2 pkgs/development/libraries/librevisa/default.nix+2−2 pkgs/development/libraries/librsvg/default.nix+2−2 pkgs/development/libraries/libsamplerate/default.nix+2−2 pkgs/development/libraries/libsearpc/default.nix+2−2 pkgs/development/libraries/libsecret/default.nix+2−2 pkgs/development/libraries/libserialport/default.nix+2−2 pkgs/development/libraries/libshout/default.nix+3−3 pkgs/development/libraries/libsidplayfp/default.nix+2−2 pkgs/development/libraries/libsigcxx/1.2.nix+2−2 pkgs/development/libraries/libsigcxx/default.nix+2−2 pkgs/development/libraries/libsignon-glib/default.nix+2−2 pkgs/development/libraries/libskk/default.nix+2−2 pkgs/development/libraries/libsmartcols/default.nix+2−2 pkgs/development/libraries/libsndfile/default.nix+2−2 pkgs/development/libraries/libsoup/default.nix+2−2 pkgs/development/libraries/libspatialite/default.nix+2−2 pkgs/development/libraries/libspectre/default.nix+2−2 pkgs/development/libraries/libspectrum/default.nix+2−2 pkgs/development/libraries/libspiro/default.nix+2−2 pkgs/development/libraries/libspotify/default.nix+2−2 pkgs/development/libraries/libssh/default.nix+2−2 pkgs/development/libraries/libtap/default.nix+2−2 pkgs/development/libraries/libtelnet/default.nix+2−2 pkgs/development/libraries/libtermkey/default.nix+2−2 pkgs/development/libraries/libtheora/default.nix+2−2 pkgs/development/libraries/libtiff/default.nix+2−2 pkgs/development/libraries/libtiger/default.nix+2−2 pkgs/development/libraries/libtorrent-rasterbar/1.1.nix+2−2 pkgs/development/libraries/libtoxcore/default.nix+2−2 pkgs/development/libraries/libtoxcore/new-api.nix+2−2 pkgs/development/libraries/libtsm/default.nix+2−2 pkgs/development/libraries/libu2f-host/default.nix+2−2 pkgs/development/libraries/libu2f-server/default.nix+2−2 pkgs/development/libraries/libubox/default.nix+2−2 pkgs/development/libraries/libui/default.nix+2−2 pkgs/development/libraries/libuinputplus/default.nix+2−2 pkgs/development/libraries/libunique/3.x.nix+2−2 pkgs/development/libraries/libunique/default.nix+2−2 pkgs/development/libraries/libunity/default.nix+2−2 pkgs/development/libraries/libusb-compat/0.1.nix+2−2 pkgs/development/libraries/libusb1/default.nix+2−2 pkgs/development/libraries/libusbmuxd/default.nix+2−2 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/libva/1.0.0.nix+2−2 pkgs/development/libraries/libvdpau-va-gl/default.nix+2−2 pkgs/development/libraries/libvdpau/default.nix+2−2 pkgs/development/libraries/libviper/default.nix+2−2 pkgs/development/libraries/libvirt-glib/default.nix+2−2 pkgs/development/libraries/libvirt/5.9.0.nix+2−2 pkgs/development/libraries/libvisio/default.nix+2−2 pkgs/development/libraries/libvisual/default.nix+2−2 pkgs/development/libraries/libvmi/default.nix+2−2 pkgs/development/libraries/libvorbis/default.nix+2−2 pkgs/development/libraries/libvterm/default.nix+2−2 pkgs/development/libraries/libwacom/default.nix+2−2 pkgs/development/libraries/libwmf/default.nix+2−2 pkgs/development/libraries/libwnck/3.x.nix+2−2 pkgs/development/libraries/libwnck/default.nix+2−2 pkgs/development/libraries/libwpd/0.8.nix+2−2 pkgs/development/libraries/libwpd/default.nix+2−2 pkgs/development/libraries/libwpg/default.nix+2−2 pkgs/development/libraries/libwps/default.nix+2−2 pkgs/development/libraries/libxcomp/default.nix+2−2 pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix+2−2 pkgs/development/libraries/libxklavier/default.nix+2−2 pkgs/development/libraries/libxmlb/default.nix+2−2 pkgs/development/libraries/libxmlxx/default.nix+2−2 pkgs/development/libraries/libxmlxx/v3.nix+2−2 pkgs/development/libraries/libykclient/default.nix+2−2 pkgs/development/libraries/libykneomgr/default.nix+2−2 pkgs/development/libraries/libzapojit/default.nix+2−2 pkgs/development/libraries/libzip/default.nix+1−1 pkgs/development/libraries/libzmf/default.nix+2−2 pkgs/development/libraries/lightstep-tracer-cpp/default.nix+2−2 pkgs/development/libraries/linbox/default.nix+2−2 pkgs/development/libraries/lirc/default.nix+2−2 pkgs/development/libraries/loudmouth/default.nix+2−2 pkgs/development/libraries/lrdf/default.nix+2−2 pkgs/development/libraries/luksmeta/default.nix+2−2 pkgs/development/libraries/mediastreamer/default.nix+2−2 pkgs/development/libraries/mediastreamer/msopenh264.nix+2−2 pkgs/development/libraries/menu-cache/default.nix+2−2 pkgs/development/libraries/mesa-glu/default.nix+2−2 pkgs/development/libraries/mesa/default.nix+3−3 pkgs/development/libraries/mlt/default.nix+2−2 pkgs/development/libraries/mlt/qt-5.nix+2−2 pkgs/development/libraries/mongoc/default.nix+2−2 pkgs/development/libraries/mono-addins/default.nix+2−2 pkgs/development/libraries/motif/default.nix+2−2 pkgs/development/libraries/movit/default.nix+2−2 pkgs/development/libraries/msgpuck/default.nix+2−2 pkgs/development/libraries/msilbc/default.nix+2−2 pkgs/development/libraries/mtxclient/default.nix+2−2 pkgs/development/libraries/mumlib/default.nix+2−2 pkgs/development/libraries/mypaint-brushes/1.0.nix+2−2 pkgs/development/libraries/mypaint-brushes/default.nix+2−2 pkgs/development/libraries/mythes/default.nix+2−2 pkgs/development/libraries/ncurses/default.nix+2−2 pkgs/development/libraries/neardal/default.nix+2−2 pkgs/development/libraries/neon/0.29.nix+2−2 pkgs/development/libraries/neon/default.nix+2−2 pkgs/development/libraries/nghttp2/default.nix+2−2 pkgs/development/libraries/nix-plugins/default.nix+2−2 pkgs/development/libraries/notcurses/default.nix+2−2 pkgs/development/libraries/notify-sharp/default.nix+2−2 pkgs/development/libraries/ntrack/default.nix+2−2 pkgs/development/libraries/nuspell/default.nix+2−2 pkgs/development/libraries/ogrepaged/default.nix+2−2 pkgs/development/libraries/opencascade/default.nix+2−2 pkgs/development/libraries/opencolorio/default.nix+2−2 pkgs/development/libraries/openct/default.nix+2−2 pkgs/development/libraries/opencv/3.x.nix+2−2 pkgs/development/libraries/opencv/4.x.nix+2−2 pkgs/development/libraries/opencv/default.nix+3−3 pkgs/development/libraries/opendkim/default.nix+2−2 pkgs/development/libraries/openjpeg/generic.nix+2−2 pkgs/development/libraries/opensaml-cpp/default.nix+2−2 pkgs/development/libraries/openscenegraph/default.nix+2−2 pkgs/development/libraries/openwsman/default.nix+2−2 pkgs/development/libraries/openzwave/default.nix+3−3 pkgs/development/libraries/osm-gps-map/default.nix+2−2 pkgs/development/libraries/p11-kit/default.nix+2−2 pkgs/development/libraries/pango/default.nix+2−2 pkgs/development/libraries/pangolin/default.nix+2−2 pkgs/development/libraries/pangomm/default.nix+2−2 pkgs/development/libraries/pangoxsl/default.nix+2−2 pkgs/development/libraries/pcaudiolib/default.nix+2−2 pkgs/development/libraries/pcl/default.nix+2−2 pkgs/development/libraries/phash/default.nix+2−2 pkgs/development/libraries/phonon/backends/gstreamer.nix+3−3 pkgs/development/libraries/phonon/backends/vlc.nix+2−2 pkgs/development/libraries/phonon/default.nix+2−2 pkgs/development/libraries/pipewire/0.2.nix+2−2 pkgs/development/libraries/pipewire/default.nix+2−2 pkgs/development/libraries/pixman/default.nix+2−2 pkgs/development/libraries/pkcs11helper/default.nix+2−2 pkgs/development/libraries/pmdk/default.nix+2−2 pkgs/development/libraries/pocketsphinx/default.nix+2−2 pkgs/development/libraries/poco/default.nix+2−2 pkgs/development/libraries/podofo/default.nix+2−2 pkgs/development/libraries/polkit-qt-1/qt-4.nix+2−2 pkgs/development/libraries/polkit-qt-1/qt-5.nix+2−2 pkgs/development/libraries/polkit/default.nix+2−2 pkgs/development/libraries/poly2tri-c/default.nix+2−2 pkgs/development/libraries/poppler/0.61.nix+2−2 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/development/libraries/portaudio/default.nix+2−2 pkgs/development/libraries/protobufc/generic.nix+2−2 pkgs/development/libraries/pslib/default.nix+2−2 pkgs/development/libraries/qca-qt5/default.nix+2−2 pkgs/development/libraries/qca2/default.nix+2−2 pkgs/development/libraries/qgnomeplatform/default.nix+2−2 pkgs/development/libraries/qrencode/default.nix+2−2 pkgs/development/libraries/qt-4.x/4.8/default.nix+2−2 pkgs/development/libraries/qt-5/modules/qtbase.nix+2−2 pkgs/development/libraries/qt-5/modules/qtgamepad.nix+2−2 pkgs/development/libraries/qt-5/modules/qtmultimedia.nix+2−2 pkgs/development/libraries/qt-5/modules/qtwayland.nix+2−2 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+2−2 pkgs/development/libraries/qt-5/modules/qtwebkit.nix+2−2 pkgs/development/libraries/qtkeychain/default.nix+2−2 pkgs/development/libraries/qtstyleplugins/default.nix+2−2 pkgs/development/libraries/qtutilities/default.nix+1−1 pkgs/development/libraries/raft-canonical/default.nix+2−2 pkgs/development/libraries/rapidjson/default.nix+2−2 pkgs/development/libraries/rarian/default.nix+2−2 pkgs/development/libraries/rdkafka/default.nix+2−2 pkgs/development/libraries/rep-gtk/default.nix+2−2 pkgs/development/libraries/resolv_wrapper/default.nix+2−2 pkgs/development/libraries/rubberband/default.nix+2−2 pkgs/development/libraries/sbc/default.nix+2−2 pkgs/development/libraries/schroedinger/default.nix+2−2 pkgs/development/libraries/science/math/blas/default.nix+1−1 pkgs/development/libraries/science/math/brial/default.nix+2−2 pkgs/development/libraries/science/math/fenics/default.nix+2−2 pkgs/development/libraries/science/math/osi/default.nix+2−2 pkgs/development/libraries/science/math/tensorflow/bin.nix+1−1 pkgs/development/libraries/serd/default.nix+2−2 pkgs/development/libraries/serf/default.nix+2−2 pkgs/development/libraries/shibboleth-sp/default.nix+2−2 pkgs/development/libraries/silgraphite/default.nix+2−2 pkgs/development/libraries/silgraphite/graphite2.nix+2−2 pkgs/development/libraries/smpeg/default.nix+3−3 pkgs/development/libraries/snack/default.nix+2−2 pkgs/development/libraries/socket_wrapper/default.nix+2−2 pkgs/development/libraries/sofia-sip/default.nix+2−2 pkgs/development/libraries/soprano/default.nix+2−2 pkgs/development/libraries/soqt/default.nix+2−2 pkgs/development/libraries/sord/default.nix+2−2 pkgs/development/libraries/spatialite-tools/default.nix+2−2 pkgs/development/libraries/speechd/default.nix+2−2 pkgs/development/libraries/speex/default.nix+2−2 pkgs/development/libraries/speexdsp/default.nix+2−2 pkgs/development/libraries/sphinxbase/default.nix+2−2 pkgs/development/libraries/spice-gtk/default.nix+2−2 pkgs/development/libraries/spice/default.nix+2−2 pkgs/development/libraries/srtp/default.nix+2−2 pkgs/development/libraries/startup-notification/default.nix+2−2 pkgs/development/libraries/subunit/default.nix+2−2 pkgs/development/libraries/svrcore/default.nix+2−2 pkgs/development/libraries/sword/default.nix+2−2 pkgs/development/libraries/taglib-sharp/default.nix+2−2 pkgs/development/libraries/telepathy/farstream/default.nix+2−2 pkgs/development/libraries/telepathy/glib/default.nix+2−2 pkgs/development/libraries/telepathy/qt/default.nix+2−2 pkgs/development/libraries/template-glib/default.nix+2−2 pkgs/development/libraries/thrift/0.10.nix+2−2 pkgs/development/libraries/thrift/default.nix+2−2 pkgs/development/libraries/timezonemap/default.nix+2−2 pkgs/development/libraries/tinyxml/2.6.2.nix+1−1 pkgs/development/libraries/tk/generic.nix+2−2 pkgs/development/libraries/tokyo-tyrant/default.nix+2−2 pkgs/development/libraries/totem-pl-parser/default.nix+2−2 pkgs/development/libraries/tracker-miners/default.nix+2−2 pkgs/development/libraries/tracker/default.nix+3−3 pkgs/development/libraries/tremor/default.nix+2−2 pkgs/development/libraries/twolame/default.nix+2−2 pkgs/development/libraries/uci/default.nix+2−2 pkgs/development/libraries/ucommon/default.nix+2−2 pkgs/development/libraries/uhttpmock/default.nix+2−2 pkgs/development/libraries/uid_wrapper/default.nix+2−2 pkgs/development/libraries/unibilium/default.nix+2−2 pkgs/development/libraries/unicorn/default.nix+2−2 pkgs/development/libraries/usbredir/default.nix+2−2 pkgs/development/libraries/v8/default.nix+2−2 pkgs/development/libraries/v8/plv8_6_x.nix+2−2 pkgs/development/libraries/vaapi-intel-hybrid/default.nix+2−2 pkgs/development/libraries/vaapi-vdpau/default.nix+2−2 pkgs/development/libraries/vapoursynth-mvtools/default.nix+2−2 pkgs/development/libraries/vapoursynth/default.nix+2−2 pkgs/development/libraries/vcdimager/default.nix+2−2 pkgs/development/libraries/virglrenderer/default.nix+2−2 pkgs/development/libraries/vmime/default.nix+2−2 pkgs/development/libraries/vmmlib/default.nix+2−2 pkgs/development/libraries/volume-key/default.nix+2−2 pkgs/development/libraries/vte/2.90.nix+2−2 pkgs/development/libraries/vte/default.nix+2−2 pkgs/development/libraries/vulkan-loader/default.nix+2−2 pkgs/development/libraries/wayland/default.nix+3−3 pkgs/development/libraries/wayland/protocols.nix+2−2 pkgs/development/libraries/waylandpp/default.nix+2−2 pkgs/development/libraries/webkitgtk/default.nix+2−2 pkgs/development/libraries/wxSVG/default.nix+2−2 pkgs/development/libraries/wxwidgets/2.8/default.nix+2−2 pkgs/development/libraries/wxwidgets/2.9/default.nix+2−2 pkgs/development/libraries/wxwidgets/3.0/default.nix+2−2 pkgs/development/libraries/wxwidgets/3.1/default.nix+2−2 pkgs/development/libraries/xapian/tools/omega/default.nix+2−2 pkgs/development/libraries/xcb-util-cursor/HEAD.nix+2−2 pkgs/development/libraries/xdg-dbus-proxy/default.nix+2−2 pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix+2−2 pkgs/development/libraries/xdg-desktop-portal/default.nix+2−2 pkgs/development/libraries/xine-lib/default.nix+2−2 pkgs/development/libraries/xml-security-c/default.nix+2−2 pkgs/development/libraries/xml-tooling-c/default.nix+2−2 pkgs/development/libraries/xmlsec/default.nix+3−3 pkgs/development/libraries/yubico-pam/default.nix+2−2 pkgs/development/libraries/zchunk/default.nix+2−2 pkgs/development/libraries/zeitgeist/default.nix+2−2 pkgs/development/libraries/zmqpp/default.nix+2−2 pkgs/development/lua-modules/overrides.nix+1−1 pkgs/development/misc/yelp-tools/default.nix+2−2 pkgs/development/mobile/adbfs-rootless/default.nix+2−2 pkgs/development/mobile/webos/novacom.nix+2−2 pkgs/development/mobile/webos/novacomd.nix+2−2 pkgs/development/node-packages/default.nix+1−1 pkgs/development/ocaml-modules/cairo2/default.nix+2−2 pkgs/development/ocaml-modules/ctypes/default.nix+2−2 pkgs/development/ocaml-modules/fontconfig/default.nix+2−2 pkgs/development/ocaml-modules/gmetadom/default.nix+2−2 pkgs/development/ocaml-modules/lablgtk/2.14.0.nix+2−2 pkgs/development/ocaml-modules/lablgtk/default.nix+2−2 pkgs/development/ocaml-modules/lablgtk3/default.nix+2−2 pkgs/development/ocaml-modules/lwt/default.nix+2−2 pkgs/development/ocaml-modules/magick/default.nix+2−2 pkgs/development/ocaml-modules/ocaml-cairo/default.nix+2−2 pkgs/development/ocaml-modules/ocamlnet/default.nix+2−2 pkgs/development/ocaml-modules/ocamlsdl/default.nix+3−3 pkgs/development/ocaml-modules/ocurl/default.nix+2−2 pkgs/development/ocaml-modules/sqlite3/default.nix+2−2 pkgs/development/ocaml-modules/tsdl/default.nix+2−2 pkgs/development/ocaml-modules/zarith/default.nix+2−2 pkgs/development/php-packages/event/default.nix+1−1 pkgs/development/php-packages/imagick/default.nix+1−1 pkgs/development/php-packages/memcached/default.nix+1−1 pkgs/development/php-packages/mongodb/default.nix+1−1 pkgs/development/php-packages/yaml/default.nix+1−1 pkgs/development/pure-modules/audio/default.nix+2−2 pkgs/development/pure-modules/avahi/default.nix+2−2 pkgs/development/pure-modules/csv/default.nix+2−2 pkgs/development/pure-modules/doc/default.nix+2−2 pkgs/development/pure-modules/fastcgi/default.nix+2−2 pkgs/development/pure-modules/faust/default.nix+2−2 pkgs/development/pure-modules/ffi/default.nix+2−2 pkgs/development/pure-modules/gen/default.nix+2−2 pkgs/development/pure-modules/gl/default.nix+2−2 pkgs/development/pure-modules/glpk/default.nix+2−2 pkgs/development/pure-modules/gplot/default.nix+2−2 pkgs/development/pure-modules/gsl/default.nix+2−2 pkgs/development/pure-modules/gtk/default.nix+2−2 pkgs/development/pure-modules/liblo/default.nix+2−2 pkgs/development/pure-modules/lilv/default.nix+2−2 pkgs/development/pure-modules/lv2/default.nix+2−2 pkgs/development/pure-modules/midi/default.nix+2−2 pkgs/development/pure-modules/mpfr/default.nix+2−2 pkgs/development/pure-modules/octave/default.nix+2−2 pkgs/development/pure-modules/odbc/default.nix+2−2 pkgs/development/pure-modules/pandoc/default.nix+2−2 pkgs/development/pure-modules/rational/default.nix+2−2 pkgs/development/pure-modules/readline/default.nix+2−2 pkgs/development/pure-modules/sockets/default.nix+2−2 pkgs/development/pure-modules/sql3/default.nix+2−2 pkgs/development/pure-modules/stldict/default.nix+2−2 pkgs/development/pure-modules/stllib/default.nix+2−2 pkgs/development/pure-modules/tk/default.nix+2−2 pkgs/development/pure-modules/xml/default.nix+2−2 pkgs/development/python-modules/av/default.nix+2−2 pkgs/development/python-modules/dbus/default.nix+2−2 pkgs/development/python-modules/fuse-python/default.nix+2−2 pkgs/development/python-modules/goocalendar/default.nix+2−2 pkgs/development/python-modules/gphoto2/default.nix+2−2 pkgs/development/python-modules/gst-python/default.nix+2−2 pkgs/development/python-modules/html5-parser/default.nix+2−2 pkgs/development/python-modules/imread/default.nix+2−2 pkgs/development/python-modules/libasyncns/default.nix+2−2 pkgs/development/python-modules/libversion/default.nix+2−2 pkgs/development/python-modules/libvirt/5.9.0.nix+2−2 pkgs/development/python-modules/libvirt/default.nix+2−2 pkgs/development/python-modules/llfuse/default.nix+2−2 pkgs/development/python-modules/matplotlib/2.nix+2−2 pkgs/development/python-modules/matplotlib/default.nix+2−2 pkgs/development/python-modules/poppler-qt5/default.nix+2−2 pkgs/development/python-modules/pyarrow/default.nix+2−2 pkgs/development/python-modules/pyatspi/default.nix+2−2 pkgs/development/python-modules/pycangjie/default.nix+2−2 pkgs/development/python-modules/pygobject/3.36.nix+2−2 pkgs/development/python-modules/pygobject/3.nix+2−2 pkgs/development/python-modules/pygobject/default.nix+2−2 pkgs/development/python-modules/pygraphviz/default.nix+2−2 pkgs/development/python-modules/pygtk/default.nix+2−2 pkgs/development/python-modules/pygtksourceview/default.nix+2−2 pkgs/development/python-modules/pyqt/4.x.nix+2−2 pkgs/development/python-modules/pyqt/5.x.nix+2−2 pkgs/development/python-modules/pyqtwebengine/default.nix+2−2 pkgs/development/python-modules/pysmbc/default.nix+2−2 pkgs/development/python-modules/python-efl/default.nix+2−2 pkgs/development/python-modules/python-igraph/default.nix+2−2 pkgs/development/python-modules/python_openzwave/default.nix+2−2 pkgs/development/python-modules/pythonnet/default.nix+2−2 pkgs/development/python-modules/roboschool/default.nix+2−2 pkgs/development/python-modules/secp256k1/default.nix+2−2 pkgs/development/python-modules/sentencepiece/default.nix+2−2 pkgs/development/python-modules/sipsimple/default.nix+1−1 pkgs/development/python-modules/systemd/default.nix+2−2 pkgs/development/python-modules/virtkey/default.nix+2−2 pkgs/development/python-modules/wxPython/3.0.nix+2−2 pkgs/development/python-modules/wxPython/4.0.nix+2−2 pkgs/development/python-modules/wxPython/4.1.nix+2−2 pkgs/development/python-modules/zstd/default.nix+3−3 pkgs/development/r-modules/default.nix+29−29 pkgs/development/tools/analysis/cargo-tarpaulin/default.nix+2−2 pkgs/development/tools/analysis/kcov/default.nix+2−2 pkgs/development/tools/analysis/panopticon/default.nix+2−2 pkgs/development/tools/analysis/radare2/cutter.nix+3−3 pkgs/development/tools/analysis/radare2/default.nix+2−2 pkgs/development/tools/analysis/retdec/default.nix+2−2 pkgs/development/tools/analysis/smatch/default.nix+2−2 pkgs/development/tools/analysis/sparse/default.nix+2−2 pkgs/development/tools/build-managers/cmake/default.nix+2−2 pkgs/development/tools/build-managers/conan/default.nix+2−2 pkgs/development/tools/build-managers/gnumake/4.2/default.nix+3−3 pkgs/development/tools/build-managers/gnumake/default.nix+3−3 pkgs/development/tools/build-managers/meson/default.nix+1−1 pkgs/development/tools/build-managers/tup/default.nix+2−2 pkgs/development/tools/cargo-web/default.nix+2−2 pkgs/development/tools/chit/default.nix+2−2 pkgs/development/tools/diesel-cli/default.nix+2−2 pkgs/development/tools/documentation/gnome-doc-utils/default.nix+2−2 pkgs/development/tools/drm_info/default.nix+2−2 pkgs/development/tools/flatpak-builder/default.nix+2−2 pkgs/development/tools/fmbt/default.nix+2−2 pkgs/development/tools/git-series/default.nix+2−2 pkgs/development/tools/glslviewer/default.nix+2−2 pkgs/development/tools/gnome-desktop-testing/default.nix+2−2 pkgs/development/tools/godot/default.nix+2−2 pkgs/development/tools/guile/g-wrap/default.nix+2−2 pkgs/development/tools/halfempty/default.nix+2−2 pkgs/development/tools/icestorm/default.nix+2−2 pkgs/development/tools/icr/default.nix+2−2 pkgs/development/tools/jo/default.nix+2−2 pkgs/development/tools/kafkacat/default.nix+2−2 pkgs/development/tools/libsigrok/default.nix+2−2 pkgs/development/tools/libsigrokdecode/default.nix+2−2 pkgs/development/tools/mdk/default.nix+2−2 pkgs/development/tools/misc/autogen/default.nix+2−2 pkgs/development/tools/misc/awf/default.nix+2−2 pkgs/development/tools/misc/babeltrace/default.nix+2−2 pkgs/development/tools/misc/blackmagic/default.nix+2−2 pkgs/development/tools/misc/bsdbuild/default.nix+2−2 pkgs/development/tools/misc/coccinelle/default.nix+2−2 pkgs/development/tools/misc/d-feet/default.nix+2−2 pkgs/development/tools/misc/dfu-util/default.nix+2−2 pkgs/development/tools/misc/distcc/default.nix+3−3 pkgs/development/tools/misc/eggdbus/default.nix+2−2 pkgs/development/tools/misc/fujprog/default.nix+2−2 pkgs/development/tools/misc/gdb/default.nix+2−2 pkgs/development/tools/misc/gob2/default.nix+2−2 pkgs/development/tools/misc/gpshell/default.nix+2−2 pkgs/development/tools/misc/gtkdialog/default.nix+2−2 pkgs/development/tools/misc/gtkperf/default.nix+2−2 pkgs/development/tools/misc/hydra-cli/default.nix+2−2 pkgs/development/tools/misc/hydra/common.nix+2−2 pkgs/development/tools/misc/intel-gpu-tools/default.nix+2−2 pkgs/development/tools/misc/kconfig-frontends/default.nix+2−2 pkgs/development/tools/misc/lttng-tools/default.nix+2−2 pkgs/development/tools/misc/lttv/default.nix+2−2 pkgs/development/tools/misc/msitools/default.nix+2−2 pkgs/development/tools/misc/pkg-config/default.nix+1−1 pkgs/development/tools/misc/sccache/default.nix+2−2 pkgs/development/tools/misc/sysbench/default.nix+2−2 pkgs/development/tools/misc/universal-ctags/default.nix+2−2 pkgs/development/tools/misc/usb-modeswitch/default.nix+2−2 pkgs/development/tools/nemiver/default.nix+2−2 pkgs/development/tools/ofono-phonesim/default.nix+2−2 pkgs/development/tools/osslsigncode/default.nix+2−2 pkgs/development/tools/parsing/antlr/4.8.nix+2−2 pkgs/development/tools/parsing/hammer/default.nix+2−2 pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+13−13 pkgs/development/tools/profiling/oprofile/default.nix+2−2 pkgs/development/tools/profiling/sysprof/default.nix+2−2 pkgs/development/tools/profiling/systemtap/default.nix+2−2 pkgs/development/tools/pxview/default.nix+2−2 pkgs/development/tools/py-spy/default.nix+1−1 pkgs/development/tools/rtags/default.nix+2−2 pkgs/development/tools/rust/cargo-deny/default.nix+2−2 pkgs/development/tools/rust/cargo-geiger/default.nix+2−2 pkgs/development/tools/rust/cargo-generate/default.nix+2−2 pkgs/development/tools/rust/cargo-raze/default.nix+2−2 pkgs/development/tools/rust/cargo-udeps/default.nix+2−2 pkgs/development/tools/rust/maturin/default.nix+2−2 pkgs/development/tools/rust/rustup/default.nix+2−2 pkgs/development/tools/scaff/default.nix+2−2 pkgs/development/tools/sigrok-cli/default.nix+2−2 pkgs/development/tools/simavr/default.nix+2−2 pkgs/development/tools/sunxi-tools/default.nix+2−2 pkgs/development/tools/tracy/default.nix+2−2 pkgs/development/tools/vala-lint/default.nix+2−2 pkgs/development/tools/vogl/default.nix+2−2 pkgs/development/tools/vulkan-validation-layers/default.nix+2−2 pkgs/development/tools/wasm-bindgen-cli/default.nix+2−2 pkgs/development/tools/wasm-pack/default.nix+2−2 pkgs/development/tools/watchman/default.nix+2−2 pkgs/development/web/kcgi/default.nix+2−2 pkgs/development/web/nodejs/nodejs.nix+3−3 pkgs/development/web/valum/default.nix+2−2 pkgs/development/web/woff2/default.nix+2−2 pkgs/games/0ad/game.nix+3−3 pkgs/os-specific/linux/afuse/default.nix+2−2 pkgs/os-specific/linux/alsa-plugins/default.nix+2−2 pkgs/os-specific/linux/alsa-tools/default.nix+2−2 pkgs/os-specific/linux/apparmor/default.nix+4−4 pkgs/os-specific/linux/batman-adv/alfred.nix+3−3 pkgs/os-specific/linux/batman-adv/batctl.nix+3−3 pkgs/os-specific/linux/bluez/default.nix+2−2 pkgs/os-specific/linux/bolt/default.nix+2−2 pkgs/os-specific/linux/bpftrace/default.nix+2−2 pkgs/os-specific/linux/btfs/default.nix+2−2 pkgs/os-specific/linux/cifs-utils/default.nix+2−2 pkgs/os-specific/linux/conky/default.nix+2−2 pkgs/os-specific/linux/conntrack-tools/default.nix+2−2 pkgs/os-specific/linux/crda/default.nix+2−2 pkgs/os-specific/linux/criu/default.nix+2−2 pkgs/os-specific/linux/cryptsetup/default.nix+2−2 pkgs/os-specific/linux/dbus-broker/default.nix+2−2 pkgs/os-specific/linux/directvnc/default.nix+2−2 pkgs/os-specific/linux/dpdk/default.nix+2−2 pkgs/os-specific/linux/dropwatch/default.nix+2−2 pkgs/os-specific/linux/ell/default.nix+2−2 pkgs/os-specific/linux/erofs-utils/default.nix+2−2 pkgs/os-specific/linux/eudev/default.nix+2−2 pkgs/os-specific/linux/fbterm/default.nix+2−2 pkgs/os-specific/linux/ffado/default.nix+2−2 pkgs/os-specific/linux/firmware/firmware-manager/default.nix+2−2 pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix+1−1 pkgs/os-specific/linux/firmware/system76-firmware/default.nix+2−2 pkgs/os-specific/linux/fwts/default.nix+2−2 pkgs/os-specific/linux/guvcview/default.nix+2−2 pkgs/os-specific/linux/hal-flash/default.nix+2−2 pkgs/os-specific/linux/hostapd/default.nix+2−2 pkgs/os-specific/linux/iio-sensor-proxy/default.nix+2−2 pkgs/os-specific/linux/ima-evm-utils/default.nix+2−2 pkgs/os-specific/linux/intel-compute-runtime/default.nix+2−2 pkgs/os-specific/linux/ipset/default.nix+2−2 pkgs/os-specific/linux/iptables/default.nix+2−2 pkgs/os-specific/linux/iputils/default.nix+2−2 pkgs/os-specific/linux/ipvsadm/default.nix+2−2 pkgs/os-specific/linux/irqbalance/default.nix+2−2 pkgs/os-specific/linux/iwd/default.nix+2−2 pkgs/os-specific/linux/jool/cli.nix+2−2 pkgs/os-specific/linux/kbd/default.nix+2−2 pkgs/os-specific/linux/kernel/perf.nix+2−2 pkgs/os-specific/linux/kmod/default.nix+2−2 pkgs/os-specific/linux/kmscon/default.nix+2−2 pkgs/os-specific/linux/kmscube/default.nix+2−2 pkgs/os-specific/linux/latencytop/default.nix+2−2 pkgs/os-specific/linux/libatasmart/default.nix+2−2 pkgs/os-specific/linux/libbpf/default.nix+3−3 pkgs/os-specific/linux/libevdevc/default.nix+1−1 pkgs/os-specific/linux/libfabric/default.nix+2−2 pkgs/os-specific/linux/libgestures/default.nix+2−2 pkgs/os-specific/linux/libnl/default.nix+2−2 pkgs/os-specific/linux/libpsm2/default.nix+2−2 pkgs/os-specific/linux/libratbag/default.nix+2−2 pkgs/os-specific/linux/libselinux/default.nix+2−2 pkgs/os-specific/linux/libsemanage/default.nix+2−2 pkgs/os-specific/linux/libsmbios/default.nix+2−2 pkgs/os-specific/linux/lightum/default.nix+2−2 pkgs/os-specific/linux/lvm2/default.nix+2−2 pkgs/os-specific/linux/lxc/default.nix+2−2 pkgs/os-specific/linux/lxcfs/default.nix+2−2 pkgs/os-specific/linux/miraclecast/default.nix+2−2 pkgs/os-specific/linux/multipath-tools/default.nix+2−2 pkgs/os-specific/linux/nfs-utils/default.nix+2−2 pkgs/os-specific/linux/nftables/default.nix+2−2 pkgs/os-specific/linux/numatop/default.nix+2−2 pkgs/os-specific/linux/nvidia-x11/settings.nix+2−2 pkgs/os-specific/linux/odp-dpdk/default.nix+2−2 pkgs/os-specific/linux/ofp/default.nix+2−2 pkgs/os-specific/linux/openvswitch/default.nix+2−2 pkgs/os-specific/linux/openvswitch/lts.nix+2−2 pkgs/os-specific/linux/pam_mount/default.nix+2−2 pkgs/os-specific/linux/pam_pgsql/default.nix+2−2 pkgs/os-specific/linux/pam_u2f/default.nix+2−2 pkgs/os-specific/linux/pam_usb/default.nix+2−2 pkgs/os-specific/linux/piper/default.nix+2−2 pkgs/os-specific/linux/pktgen/default.nix+2−2 pkgs/os-specific/linux/plymouth/default.nix+2−2 pkgs/os-specific/linux/pommed-light/default.nix+2−2 pkgs/os-specific/linux/powertop/default.nix+2−2 pkgs/os-specific/linux/procps-ng/default.nix+2−2 pkgs/os-specific/linux/pscircle/default.nix+2−2 pkgs/os-specific/linux/radeontools/default.nix+2−2 pkgs/os-specific/linux/radeontop/default.nix+2−2 pkgs/os-specific/linux/rdma-core/default.nix+2−2 pkgs/os-specific/linux/rewritefs/default.nix+2−2 pkgs/os-specific/linux/roccat-tools/default.nix+2−2 pkgs/os-specific/linux/rtkit/default.nix+2−2 pkgs/os-specific/linux/sssd/default.nix+2−2 pkgs/os-specific/linux/systemd/default.nix+2−2 pkgs/os-specific/linux/thunderbolt/default.nix+2−2 pkgs/os-specific/linux/udisks-glue/default.nix+2−2 pkgs/os-specific/linux/udisks/1-default.nix+2−2 pkgs/os-specific/linux/udisks/2-default.nix+2−2 pkgs/os-specific/linux/unstick/default.nix+2−2 pkgs/os-specific/linux/upower/default.nix+2−2 pkgs/os-specific/linux/usbguard/default.nix+2−2 pkgs/os-specific/linux/usbutils/default.nix+2−2 pkgs/os-specific/linux/usermount/default.nix+2−2 pkgs/os-specific/linux/util-linux/default.nix+2−2 pkgs/os-specific/linux/uvcdynctrl/default.nix+2−2 pkgs/os-specific/linux/v4l-utils/default.nix+2−2 pkgs/os-specific/linux/wpa_supplicant/default.nix+2−2 pkgs/os-specific/linux/xf86-input-cmt/default.nix+2−2 pkgs/os-specific/linux/xf86-input-wacom/default.nix+2−2 pkgs/os-specific/linux/xf86-video-nested/default.nix+2−2 pkgs/os-specific/linux/xsensors/default.nix+2−2 pkgs/os-specific/linux/zenmonitor/default.nix+2−2 pkgs/os-specific/linux/zfs/default.nix+2−2 pkgs/os-specific/solo5/default.nix+2−2 pkgs/os-specific/windows/cygwin-setup/default.nix+2−2 pkgs/servers/apcupsd/default.nix+2−2 pkgs/servers/asterisk/default.nix+2−2 pkgs/servers/brickd/default.nix+2−2 pkgs/servers/code-server/default.nix+2−2 pkgs/servers/computing/slurm/default.nix+2−2 pkgs/servers/computing/torque/default.nix+2−2 pkgs/servers/corosync/default.nix+2−2 pkgs/servers/dns/dnsdist/default.nix+2−2 pkgs/servers/dns/knot-dns/default.nix+2−2 pkgs/servers/dns/knot-resolver/default.nix+2−2 pkgs/servers/dns/pdns-recursor/default.nix+2−2 pkgs/servers/dns/powerdns/default.nix+2−2 pkgs/servers/fcgiwrap/default.nix+2−2 pkgs/servers/fileshare/default.nix+2−2 pkgs/servers/hitch/default.nix+2−2 pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix+2−2 pkgs/servers/http/apache-modules/mod_ca/default.nix+2−2 pkgs/servers/http/apache-modules/mod_crl/default.nix+2−2 pkgs/servers/http/apache-modules/mod_csr/default.nix+2−2 pkgs/servers/http/apache-modules/mod_dnssd/default.nix+2−2 pkgs/servers/http/apache-modules/mod_ocsp/default.nix+2−2 pkgs/servers/http/apache-modules/mod_pkcs12/default.nix+2−2 pkgs/servers/http/apache-modules/mod_scep/default.nix+2−2 pkgs/servers/http/apache-modules/mod_spkac/default.nix+2−2 pkgs/servers/http/apache-modules/mod_timestamp/default.nix+2−2 pkgs/servers/http/apt-cacher-ng/default.nix+2−2 pkgs/servers/http/couchdb/default.nix+2−2 pkgs/servers/http/h2o/default.nix+2−2 pkgs/servers/http/lighttpd/default.nix+2−2 pkgs/servers/http/lwan/default.nix+2−2 pkgs/servers/http/pshs/default.nix+2−2 pkgs/servers/http/redstore/default.nix+2−2 pkgs/servers/irc/atheme/default.nix+2−2 pkgs/servers/irker/default.nix+2−2 pkgs/servers/ldap/389/default.nix+2−2 pkgs/servers/mail/dovecot/default.nix+2−2 pkgs/servers/mail/exim/default.nix+2−2 pkgs/servers/mail/opensmtpd/extras.nix+3−3 pkgs/servers/mail/postfix/pfixtools.nix+2−2 pkgs/servers/mail/rspamd/default.nix+2−2 pkgs/servers/mediatomb/default.nix+2−2 pkgs/servers/mirrorbits/default.nix+2−2 pkgs/servers/misc/oven-media-engine/default.nix+2−2 pkgs/servers/monitoring/lcdproc/default.nix+2−2 pkgs/servers/monitoring/zabbix/agent.nix+2−2 pkgs/servers/monitoring/zabbix/proxy.nix+2−2 pkgs/servers/monitoring/zabbix/server.nix+2−2 pkgs/servers/mumsi/default.nix+3−3 pkgs/servers/neard/default.nix+2−2 pkgs/servers/nosql/redis/default.nix+2−2 pkgs/servers/osrm-backend/default.nix+2−2 pkgs/servers/pulseaudio/default.nix+2−2 pkgs/servers/pulseaudio/pali.nix+2−2 pkgs/servers/quagga/default.nix+2−2 pkgs/servers/rpcbind/default.nix+2−2 pkgs/servers/samba/4.x.nix+2−2 pkgs/servers/scylladb/default.nix+2−2 pkgs/servers/search/groonga/default.nix+2−2 pkgs/servers/shairplay/default.nix+2−2 pkgs/servers/shairport-sync/default.nix+2−2 pkgs/servers/shishi/default.nix+2−2 pkgs/servers/sip/freeswitch/default.nix+2−2 pkgs/servers/sip/sipwitch/default.nix+2−2 pkgs/servers/smcroute/default.nix+2−2 pkgs/servers/sql/mariadb/default.nix+2−2 pkgs/servers/sql/mysql/5.7.x.nix+2−2 pkgs/servers/sql/mysql/8.0.x.nix+2−2 pkgs/servers/sql/postgresql/default.nix+2−2 pkgs/servers/sql/postgresql/ext/pgroonga.nix+2−2 pkgs/servers/sql/postgresql/ext/postgis.nix+2−2 pkgs/servers/sql/postgresql/ext/tsearch_extras.nix+2−2 pkgs/servers/squid/default.nix+2−2 pkgs/servers/tang/default.nix+2−2 pkgs/servers/tmate-ssh-server/default.nix+2−2 pkgs/servers/ttyd/default.nix+2−2 pkgs/servers/tvheadend/default.nix+2−2 pkgs/servers/uwsgi/default.nix+2−2 pkgs/servers/varnish/default.nix+2−2 pkgs/servers/varnish/digest.nix+2−2 pkgs/servers/varnish/dynamic.nix+2−2 pkgs/servers/varnish/modules.nix+2−2 pkgs/servers/web-apps/fileshelter/default.nix+2−2 pkgs/servers/web-apps/sogo/default.nix+2−2 pkgs/servers/web-apps/virtlyst/default.nix+2−2 pkgs/servers/x11/quartz-wm/default.nix+2−2 pkgs/servers/x11/xorg/default.nix+442−442 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+2−2 pkgs/servers/x11/xorg/overrides.nix+4−4 pkgs/servers/x11/xorg/xcb-util-xrm.nix+2−2 pkgs/servers/xmpp/biboumi/default.nix+2−2 pkgs/servers/zoneminder/default.nix+2−2 pkgs/tools/bluetooth/obexftp/default.nix+2−2 pkgs/tools/networking/curl/default.nix+2−2 pkgs/top-level/aliases.nix+2 pkgs/top-level/all-packages.nix+6−8 pkgs/top-level/dotnet-packages.nix+2−2 pkgs/top-level/emscripten-packages.nix+5−5 pkgs/top-level/lua-packages.nix+2−2 pkgs/top-level/perl-packages.nix+10−10 pkgs/top-level/php-packages.nix+3−3 pkgs/top-level/python-packages.nix+40−40 pkgs/top-level/release-small.nix+1−1
pkgs/applications/accessibility/contrast/default.nix+2−2
@@ -10,7 +10,7 @@
1010, meson
1111, ninja
1212, pango
13−, pkgconfig
13+, pkg-config
1414, python3
1515, rustc
1616, rustPlatform
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
3737 gettext
3838 meson
3939 ninja
40− pkgconfig
40+ pkg-config
4141 python3
4242 wrapGAppsHook
4343 glib # for glib-compile-resources
pkgs/applications/accessibility/dasher/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub
2−, autoreconfHook, pkgconfig, wrapGAppsHook
2+, autoreconfHook, pkg-config, wrapGAppsHook
33, glib, gtk3, expat, gnome-doc-utils, which
44, at-spi2-core, dbus
55, libxslt, libxml2
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 nativeBuildInputs = [
3030 autoreconfHook
3131 wrapGAppsHook
32− pkgconfig
32+ pkg-config
3333 # doc generation
3434 gnome-doc-utils
3535 which
pkgs/applications/accessibility/mousetweaks/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook
33, libX11, libXtst, libXfixes, libXcursor
44}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
15+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
1616
1717 buildInputs = [
1818 glib gtk3 gsettings-desktop-schemas
pkgs/applications/audio/a2jmidid/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2
22, python3Packages , meson, ninja }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ];
15+ nativeBuildInputs = [ pkg-config makeWrapper meson ninja ];
1616 buildInputs = [ alsaLib dbus libjack2 ] ++
1717 (with python3Packages; [ python dbus-python ]);
1818
pkgs/applications/audio/adlplug/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib
22, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
33, fetchpatch, fmt
44, adlplugChip ? "-DADLplug_CHIP=OPL3"
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext
3232 libXcursor
3333 ];
34− nativeBuildInputs = [ cmake pkgconfig fmt ];
34+ nativeBuildInputs = [ cmake pkg-config fmt ];
3535
3636 meta = with lib; {
3737 description = "OPL3 and OPN2 FM Chip Synthesizer";
pkgs/applications/audio/aj-snapshot/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }:
1+{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = packageName + "-" + version ;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 doCheck = false;
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ alsaLib minixml jack2Full ];
1717
1818 meta = with lib; {
pkgs/applications/audio/ams-lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config
22, wafHook, python3 }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig wafHook python3 ];
15+ nativeBuildInputs = [ pkg-config wafHook python3 ];
1616 buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];
1717
1818 meta = with lib; {
pkgs/applications/audio/ario/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool,
1+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool,
22 wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib,
33 libsoup, avahi, taglib
44 }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ];
15+ nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ];
1616 buildInputs = [
1717 gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib
1818 ];
pkgs/applications/audio/asunder/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia
1+{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkg-config, cdparanoia
22, mp3Support ? false, lame
33, oggSupport ? true, vorbis-tools
44, flacSupport ? true, flac
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1";
2020 };
2121
22− nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
22+ nativeBuildInputs = [ intltool makeWrapper pkg-config ];
2323 buildInputs = [ gtk2 libcddb ];
2424
2525 runtimeDeps =
pkgs/applications/audio/audacious/default.nix+2−2
@@ -1,6 +1,6 @@
11{
22 mkDerivation, lib, fetchurl, fetchpatch,
3− gettext, pkgconfig,
3+ gettext, pkg-config,
44 qtbase,
55 alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
66 libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug,
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz";
2323 };
2424
25− nativeBuildInputs = [ gettext pkgconfig ];
25+ nativeBuildInputs = [ gettext pkg-config ];
2626
2727 buildInputs = [
2828 # Core dependencies
pkgs/applications/audio/audio-recorder/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl
2−, pkgconfig, intltool
2+, pkg-config, intltool
33, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1
44, librsvg, wrapGAppsHook
55, pulseaudioSupport ? true, libpulseaudio ? null }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # https://bugs.launchpad.net/audio-recorder/+bug/1784622
1818 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
1919
20− nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
20+ nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
2121
2222 buildInputs = [
2323 glib dbus gtk3 librsvg libappindicator-gtk3
pkgs/applications/audio/aumix/default.nix+3−3
@@ -1,9 +1,9 @@
11{lib, stdenv, fetchurl, gettext, ncurses
22, gtkGUI ? false
3−, pkgconfig ? null
3+, pkg-config ? null
44, gtk2 ? null}:
55
6−assert gtkGUI -> pkgconfig != null && gtk2 != null;
6+assert gtkGUI -> pkg-config != null && gtk2 != null;
77
88stdenv.mkDerivation rec {
99 name = "aumix-2.9.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 buildInputs = [ gettext ncurses ]
16− ++ (if gtkGUI then [pkgconfig gtk2] else []);
16+ ++ (if gtkGUI then [pkg-config gtk2] else []);
1717
1818 meta = {
1919 description = "Audio mixer for X and the console";
pkgs/applications/audio/axoloti/dfu-util.nix+2−2
@@ -1,10 +1,10 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
1+{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }:
22
33stdenv.mkDerivation rec {
44 pname = "dfu-util";
55 version = "0.8";
66
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 buildInputs = [ libusb1-axoloti ];
99
1010 src = fetchurl {
pkgs/applications/audio/axoloti/libusb1.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
1+{ stdenv, lib, fetchurl, pkg-config, systemd ? null, libobjc, IOKit, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 name = "libusb-1.0.19";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
1212
13− buildInputs = [ pkgconfig ];
13+ buildInputs = [ pkg-config ];
1414 propagatedBuildInputs =
1515 lib.optional stdenv.isLinux systemd ++
1616 lib.optionals stdenv.isDarwin [ libobjc IOKit ];
pkgs/applications/audio/bitmeter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }:
1+{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "bitmeter";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
1010 };
1111
12− nativeBuildInputs = [ autoreconfHook pkgconfig ];
12+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1313 buildInputs = [ libjack2 gtk2 ];
1414
1515 patches = [
pkgs/applications/audio/bjumblr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }:
1+{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkg-config, libsndfile }:
22
33stdenv.mkDerivation rec {
44 pname = "BJumblr";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 libX11 cairo lv2 libsndfile
1717 ];
pkgs/applications/audio/bristol/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
1+{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }:
22
33stdenv.mkDerivation rec {
44 pname = "bristol";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [
1414 alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
1515 xorg.xorgproto
pkgs/applications/audio/bsequencer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "BSEQuencer";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 xorg.libX11 cairo lv2
1717 ];
pkgs/applications/audio/bshapr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "BShapr";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 xorg.libX11 cairo lv2
1717 ];
pkgs/applications/audio/bslizr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "BSlizr";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 xorg.libX11 cairo lv2
1717 ];
pkgs/applications/audio/cadence/default.nix+2−2
@@ -6,7 +6,7 @@
66, fetchpatch
77, fetchzip
88, jack_capture
9−, pkgconfig
9+, pkg-config
1010, pulseaudioFull
1111, qtbase
1212, makeWrapper
@@ -48,7 +48,7 @@ mkDerivation rec {
4848 '';
4949
5050 nativeBuildInputs = [
51− pkgconfig
51+ pkg-config
5252 ];
5353
5454 buildInputs = [
pkgs/applications/audio/calf/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
2−, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
2+, gtk2, libjack2, ladspaH , libglade, lv2, pkg-config }:
33
44stdenv.mkDerivation rec {
55 pname = "calf";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 buildInputs = [
1616 cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
17− libglade lv2 pkgconfig
17+ libglade lv2 pkg-config
1818 ];
1919
2020 meta = with lib; {
pkgs/applications/audio/cantata/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
1+{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
22, qtbase, qtsvg, qttools, perl
33
44# Cantata doesn't build with cdparanoia enabled so we disable that
@@ -73,7 +73,7 @@ in mkDerivation {
7373 ++ lib.optional withUdisks udisks2
7474 ++ lib.optional withLibVlc libvlc;
7575
76− nativeBuildInputs = [ cmake pkgconfig qttools ];
76+ nativeBuildInputs = [ cmake pkg-config qttools ];
7777
7878 cmakeFlags = lib.flatten [
7979 (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
pkgs/applications/audio/carla/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2,
2− liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages,
2+ liblo, libpulseaudio, libsndfile, pkg-config, python3Packages,
33 which, withFrontend ? true,
44 withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
55 withGtk2 ? true, gtk2 ? null,
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 };
2626
2727 nativeBuildInputs = [
28− python3Packages.wrapPython pkgconfig which wrapQtAppsHook
28+ python3Packages.wrapPython pkg-config which wrapQtAppsHook
2929 ];
3030
3131 pythonPath = with python3Packages; [
pkgs/applications/audio/clementine/default.nix+2−2
@@ -2,7 +2,7 @@
22, qtbase, qtx11extras
33, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
44, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
5−, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }:
5+, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }:
66
77let
88 withIpod = config.clementine.ipod or false;
@@ -24,7 +24,7 @@ let
2424 ./clementine-spotify-blob.patch
2525 ];
2626
27− nativeBuildInputs = [ cmake pkgconfig ];
27+ nativeBuildInputs = [ cmake pkg-config ];
2828
2929 buildInputs = [
3030 boost
pkgs/applications/audio/cmus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig
1+{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config
22, libiconv, CoreAudio
33
44, alsaSupport ? stdenv.isLinux, alsaLib ? null
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
118118 "CONFIG_WAV=y"
119119 ] ++ concatMap (a: a.flags) opts);
120120
121− nativeBuildInputs = [ pkgconfig ];
121+ nativeBuildInputs = [ pkg-config ];
122122 buildInputs = [ ncurses ]
123123 ++ lib.optional stdenv.cc.isClang clangGCC
124124 ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
pkgs/applications/audio/cmusfm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }:
22
33stdenv.mkDerivation {
44 version = "2020-07-23";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 };
1212 # building
1313 configureFlags = [ "--enable-libnotify" ];
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ curl libnotify gdk-pixbuf ];
1616
1717 meta = with lib; {
pkgs/applications/audio/cozy-audiobooks/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub
22, ninja
33, meson
4−, pkgconfig
4+, pkg-config
55, wrapGAppsHook
66, appstream-glib
77, desktop-file-utils
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
3535 };
3636
3737 nativeBuildInputs = [
38− meson ninja pkgconfig
38+ meson ninja pkg-config
3939 wrapGAppsHook
4040 appstream-glib
4141 desktop-file-utils
pkgs/applications/audio/deadbeef/default.nix+2−2
@@ -3,7 +3,7 @@
33, automake
44, libtool
55, intltool
6−, pkgconfig
6+, pkg-config
77, jansson
88# deadbeef can use either gtk2 or gtk3
99, gtk2Support ? false, gtk2 ? null
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
9797 automake
9898 intltool
9999 libtool
100− pkgconfig
100+ pkg-config
101101 ] ++ lib.optional gtk3Support wrapGAppsHook;
102102
103103 enableParallelBuilding = true;
pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }:
1+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, libxml2, deadbeef, glib, gtk3 }:
22
33stdenv.mkDerivation rec {
44 pname = "deadbeef-headerbar-gtk3-plugin";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0";
1212 };
1313
14− nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ];
14+ nativeBuildInputs = [ autoconf automake libtool pkg-config libxml2 ];
1515 buildInputs = [ deadbeef glib gtk3 ];
1616
1717 # Choose correct installation path
pkgs/applications/audio/deadbeef/plugins/infobar.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }:
1+{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }:
22
33stdenv.mkDerivation rec {
44 pname = "deadbeef-infobar-plugin";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ deadbeef gtk3 libxml2 ];
1414
1515 buildFlags = [ "gtk3" ];
pkgs/applications/audio/deadbeef/plugins/lyricbar.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }:
22
33stdenv.mkDerivation {
44 pname = "deadbeef-lyricbar-plugin";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ deadbeef gtkmm3 libxmlxx3 ];
1616
1717 buildFlags = [ "gtk3" ];
pkgs/applications/audio/deadbeef/plugins/mpris2.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, deadbeef, glib }:
1+{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "deadbeef-mpris2-plugin";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ deadbeef glib ];
1515
pkgs/applications/audio/denemo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libjack2, gettext, intltool, guile_2_0, lilypond
33, glib, libxml2, librsvg, libsndfile, aubio
44, gtk3, gtksourceview, evince, fluidsynth, rubberband
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 wrapGAppsHook
2929 intltool
3030 gettext
31− pkgconfig
31+ pkg-config
3232 ];
3333
3434 meta = with lib; {
pkgs/applications/audio/dragonfly-reverb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }:
1+{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg }:
22
33stdenv.mkDerivation rec {
44 pname = "dragonfly-reverb";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 patchShebangs dpf/utils/generate-ttl.sh
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [
2121 libjack2 xorg.libX11 libGL
2222 ];
pkgs/applications/audio/drumgizmo/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng
2−, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler
2+, libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler
33}:
44
55stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 buildInputs = [
2727 alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs
28− libsmf libsndfile lv2 pkgconfig zita-resampler
28+ libsmf libsndfile lv2 pkg-config zita-resampler
2929 ];
3030
3131 meta = with lib; {
pkgs/applications/audio/drumkv1/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
1+{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
22
33mkDerivation rec {
44 pname = "drumkv1";
@@ -11,7 +11,7 @@ mkDerivation rec {
1111
1212 buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 meta = with lib; {
1717 description = "An old-school drum-kit sampler synthesizer with stereo fx";
pkgs/applications/audio/easytag/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
1+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib
22, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas
33, gnome3, wrapGAppsHook
44}:
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
1616
1717 NIX_LDFLAGS = "-lid3tag -lz";
1818
19− nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
19+ nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
2020 buildInputs = [
2121 gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
2222 gsettings-desktop-schemas gnome3.adwaita-icon-theme
pkgs/applications/audio/ekho/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libsndfile, libpulseaudio
33}:
44
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333 NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\""
3434 '';
3535
36− nativeBuildInputs = [ pkgconfig ];
36+ nativeBuildInputs = [ pkg-config ];
3737
3838 buildInputs = [ libsndfile libpulseaudio ];
3939}
pkgs/applications/audio/ensemble-chorus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "ensemble-chorus";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 buildInputs = [
1818 fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2
pkgs/applications/audio/espeak-ng/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig
1+{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config
22, ronn
33, pcaudiolibSupport ? true, pcaudiolib
44, sonicSupport ? true, sonic }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b";
1515 };
1616
17− nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ];
17+ nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ];
1818
1919 buildInputs = lib.optional pcaudiolibSupport pcaudiolib
2020 ++ lib.optional sonicSupport sonic;
pkgs/applications/audio/espeak/edit.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }:
1+{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }:
22
33stdenv.mkDerivation rec {
44 name = "espeakedit-1.48.03";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ unzip portaudio wxGTK ];
1313
1414 # TODO:
pkgs/applications/audio/faust/faust1.nix+2−2
@@ -2,7 +2,7 @@
22, coreutils
33, fetchurl
44, makeWrapper
5−, pkgconfig
5+, pkg-config
66}:
77
88with lib.strings;
@@ -159,7 +159,7 @@ let
159159
160160 stdenv.mkDerivation ((faust2ApplBase args) // {
161161
162− nativeBuildInputs = [ pkgconfig ];
162+ nativeBuildInputs = [ pkg-config ];
163163 buildInputs = [ makeWrapper ];
164164
165165 propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
pkgs/applications/audio/faust/faust2.nix+3−3
@@ -2,7 +2,7 @@
22, coreutils
33, fetchFromGitHub
44, makeWrapper
5−, pkgconfig
5+, pkg-config
66, cmake
77, llvm
88, emscripten
@@ -45,7 +45,7 @@ let
4545
4646 inherit src;
4747
48− nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
48+ nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ];
4949 buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
5050
5151
@@ -168,7 +168,7 @@ let
168168
169169 stdenv.mkDerivation ((faust2ApplBase args) // {
170170
171− nativeBuildInputs = [ pkgconfig ];
171+ nativeBuildInputs = [ pkg-config ];
172172 buildInputs = [ makeWrapper ];
173173
174174 propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
pkgs/applications/audio/faust/faust2jackrust.nix+2−2
@@ -6,7 +6,7 @@
66, gcc
77, gnumake
88, openssl
9−, pkgconfig
9+, pkg-config
1010
1111}:
1212
@@ -14,5 +14,5 @@ faust.wrapWithBuildEnv {
1414
1515 baseName = "faust2jackrust";
1616
17− propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ];
17+ propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkg-config ];
1818}
pkgs/applications/audio/flacon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig, shntool, flac
1+{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac
22, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase
33, qttools, wrapQtAppsHook }:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv";
1414 };
1515
16− nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
16+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
1717 buildInputs = [ qtbase qttools libuchardet ];
1818
1919 bin_path = lib.makeBinPath [
pkgs/applications/audio/fluidsynth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
1+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
22, alsaLib, glib, libjack2, libsndfile, libpulseaudio
33, AudioUnit, CoreAudio, CoreMIDI, CoreServices
44, version ? "2"
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
3030 inherit sha256;
3131 };
3232
33− nativeBuildInputs = [ pkgconfig cmake ];
33+ nativeBuildInputs = [ pkg-config cmake ];
3434
3535 buildInputs = [ glib libsndfile libpulseaudio libjack2 ]
3636 ++ lib.optionals stdenv.isLinux [ alsaLib ]
pkgs/applications/audio/fmsynth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkg-config }:
22stdenv.mkDerivation {
33 pname = "fmsynth-unstable";
44 version = "2015-02-07";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ gtkmm2 lv2 lvtk ];
1414
1515 buildPhase = ''
pkgs/applications/audio/fomp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:
1+{ lib, stdenv, fetchurl, lv2, pkg-config, python2, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "fomp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig wafHook ];
12+ nativeBuildInputs = [ pkg-config wafHook ];
1313 buildInputs = [ lv2 python2 ];
1414
1515 meta = with lib; {
pkgs/applications/audio/foo-yc20/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }:
22
33stdenv.mkDerivation {
44 version = "git-2015-05-21";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libjack2 gtk2 lv2 faust ];
1515
1616 makeFlags = [ "PREFIX=$(out)" ];
pkgs/applications/audio/freewheeling/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
1+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype
22, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
33, libSM, libsndfile, libogg, libtool
44}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig autoreconfHook libtool ];
20+ nativeBuildInputs = [ pkg-config autoreconfHook libtool ];
2121 buildInputs = [
2222 freetype SDL SDL_gfx SDL_ttf
2323 liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
pkgs/applications/audio/gigedit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which
1+{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which
22, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 preConfigure = "make -f Makefile.svn";
1515
16− nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
16+ nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ];
1717
1818 buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
1919
pkgs/applications/audio/gjay/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
1+{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
22, libaudclient }:
33
44stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];
1515
pkgs/applications/audio/gmpc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libtool, intltool, pkgconfig, glib
1+{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib
22, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
33, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook
44}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616 patches = [ ./libmpd-11.8.17-remove-strndup.patch ];
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ glib ];
2020 };
2121
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
2525 };
2626
27− nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];
27+ nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ];
2828 buildInputs = [
2929 glib gtk2 curl mpd_clientlib libsoup
3030 libunique libmpd libSM libICE sqlite hicolor-icon-theme
pkgs/applications/audio/gnome-podcasts/default.nix+2−2
@@ -8,7 +8,7 @@
88, cargo
99, rustc
1010, python3
11−, pkgconfig
11+, pkg-config
1212, glib
1313, libhandy_0
1414, gtk3
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
3636 nativeBuildInputs = [
3737 meson
3838 ninja
39− pkgconfig
39+ pkg-config
4040 gettext
4141 cargo
4242 rustc
pkgs/applications/audio/gradio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, pkg-config
22, python3
33, gsettings-desktop-schemas
44, desktop-file-utils
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
3030 };
3131
3232 nativeBuildInputs = [
33− pkgconfig
33+ pkg-config
3434
3535 meson
3636 ninja
pkgs/applications/audio/grandorgue/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchsvn, cmake, pkg-config, gcc, pkgconfig, fftwFloat, alsaLib
1+{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib
22, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2
33, includeDemo ? true }:
44
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ cmake pkg-config ];
1616
17− buildInputs = [ pkgconfig fftwFloat alsaLib zlib wavpack wxGTK31 udev ]
17+ buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ]
1818 ++ lib.optional jackaudioSupport libjack2;
1919
2020 cmakeFlags = lib.optional (!jackaudioSupport) [
pkgs/applications/audio/gtkpod/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
1+{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac,
22 gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
33 libvorbis, gdk-pixbuf }:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
14+ nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
1515 buildInputs = [
1616 curl gettext
1717 flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
pkgs/applications/audio/guitarix/default.nix+2−2
@@ -23,7 +23,7 @@
2323, lilv
2424, lrdf
2525, lv2
26−, pkgconfig
26+, pkg-config
2727, python2
2828, sassc
2929, serd
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
5353 gettext
5454 hicolor-icon-theme
5555 intltool
56− pkgconfig
56+ pkg-config
5757 python2
5858 wafHook
5959 wrapGAppsHook
pkgs/applications/audio/gxmatcheq-lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "GxMatchEQ.lv2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 xorg.libX11 xorgproto cairo lv2
1717 ];
pkgs/applications/audio/gxplugins-lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "GxPlugins.lv2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [
1717 xorg.libX11 xorgproto cairo lv2
1818 ];
pkgs/applications/audio/helio-workstation/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub
22, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3
3−, pkgconfig, makeWrapper
3+, pkg-config, makeWrapper
44}:
55
66stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity
2121 ];
2222
23− nativeBuildInputs = [ pkgconfig makeWrapper ];
23+ nativeBuildInputs = [ pkg-config makeWrapper ];
2424
2525 preBuild = ''
2626 cd Projects/LinuxMakefile
pkgs/applications/audio/helm/default.nix+2−2
@@ -7,7 +7,7 @@
77, curl
88, libjack2
99, lv2
10−, pkgconfig
10+, pkg-config
1111, libGLU
1212, libGL
1313}:
@@ -26,7 +26,7 @@
2626 buildInputs = [
2727 xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
2828 xorg.libXinerama xorg.libXrender xorg.libXrandr
29− freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2
29+ freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2
3030 ];
3131
3232 CXXFLAGS = "-DHAVE_LROUND";
pkgs/applications/audio/hybridreverb2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2,
1+{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2,
22 freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon,
33 epoxy, at-spi2-core, dbus, curl, fftwFloat }:
44
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 fetchSubmodules = true;
2626 };
2727
28− nativeBuildInputs = [ pkgconfig cmake ];
28+ nativeBuildInputs = [ pkg-config cmake ];
2929 buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre
3030 libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ];
3131
pkgs/applications/audio/hydrogen/0.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, cmake
1+{ lib, stdenv, fetchurl, pkg-config, cmake
22, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig cmake ];
14+ nativeBuildInputs = [ pkg-config cmake ];
1515 buildInputs = [
1616 alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4
1717 ];
pkgs/applications/audio/hydrogen/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook
22, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf
33, qtbase, qttools, qtxmlpatterns
44}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1";
1515 };
1616
17− nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
17+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
1818 buildInputs = [
1919 alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf
2020 qtbase qttools qtxmlpatterns
pkgs/applications/audio/iannix/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
1+{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake
22}:
33
44mkDerivation rec {
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig qmake ];
15+ nativeBuildInputs = [ pkg-config qmake ];
1616 buildInputs = [ alsaLib qtbase qtscript ];
1717
1818 qmakeFlags = [ "PREFIX=/" ];
pkgs/applications/audio/infamousPlugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
22
33stdenv.mkDerivation rec {
44 pname = "infamousPlugins";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2";
1818 })
1919 ];
20− nativeBuildInputs = [ pkgconfig cmake ];
20+ nativeBuildInputs = [ pkg-config cmake ];
2121 buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ];
2222
2323 meta = with lib; {
pkgs/applications/audio/ingen/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
2−, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
2+, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom
33, wafHook
44, suil
55}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 deepClone = true;
1717 };
1818
19− nativeBuildInputs = [ pkgconfig wafHook ];
19+ nativeBuildInputs = [ pkg-config wafHook ];
2020 buildInputs = [
2121 boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
2222 python raul serd sord sratom suil
pkgs/applications/audio/ir.lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
1+{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }:
22
33stdenv.mkDerivation rec {
44 pname = "ir.lv2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 postPatch = ''
1919 # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20
pkgs/applications/audio/jack-capture/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libjack2, libsndfile, pkgconfig }:
1+{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "jack_capture";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libjack2 libsndfile ];
1414
1515 buildPhase = "PREFIX=$out make jack_capture";
pkgs/applications/audio/jack-oscrolloscope/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }:
1+{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "jack_oscrolloscope";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ SDL libjack2 libGLU libGL ];
1414
1515 installPhase = ''
pkgs/applications/audio/jack-rack/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }:
1+{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }:
22stdenv.mkDerivation rec {
33 name = "jack-rack-1.4.7";
44 src = fetchurl {
55 url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
66 sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
77 };
8− nativeBuildInputs = [ pkgconfig ];
8+ nativeBuildInputs = [ pkg-config ];
99 buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ];
1010 NIX_LDFLAGS = "-ldl -lm -lpthread";
1111
pkgs/applications/audio/jackmeter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libjack2, pkgconfig }:
1+{ lib, stdenv, fetchurl, libjack2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "jackmeter-0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ libjack2 ];
1313
1414 meta = {
pkgs/applications/audio/jackmix/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
1+{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
22
33mkDerivation rec {
44 pname = "jackmix";
@@ -13,7 +13,7 @@ mkDerivation rec {
1313
1414 patches = [ ./no_error.patch ];
1515
16− nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
16+ nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ];
1717 buildInputs = [
1818 qtbase
1919 lash
pkgs/applications/audio/jalv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
1+{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python
22, serd, sord , sratom, suil, wafHook }:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig wafHook ];
13+ nativeBuildInputs = [ pkg-config wafHook ];
1414 buildInputs = [
1515 gtk2 libjack2 lilv lv2 python serd sord sratom suil
1616 ];
pkgs/applications/audio/jamin/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2
2−, makeWrapper, pkgconfig, perlPackages
2+, makeWrapper, pkg-config, perlPackages
33}:
44
55stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
1616 ++ (with perlPackages; [ perl XMLParser ]);
1717
pkgs/applications/audio/klick/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, sconsPackages, pkgconfig
1+{ lib, stdenv, fetchurl, sconsPackages, pkg-config
22, libsamplerate, libsndfile, liblo, libjack2, boost }:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
1111 };
1212
13− nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ];
13+ nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ];
1414 buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
1515 prefixKey = "PREFIX=";
1616 NIX_CFLAGS_COMPILE = "-fpermissive";
pkgs/applications/audio/klystrack/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch
22, SDL2, SDL2_image
3−, pkgconfig
3+, pkg-config
44}:
55
66stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 buildInputs = [
1919 SDL2 SDL2_image
2020 ];
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222
2323 patches = [
2424 (fetchpatch {
pkgs/applications/audio/kmetronome/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }:
1+{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }:
22
33stdenv.mkDerivation rec {
44 pname = "kmetronome";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s";
1010 };
1111
12− nativeBuildInputs = [ cmake pkgconfig qttools ];
12+ nativeBuildInputs = [ cmake pkg-config qttools ];
1313
1414 buildInputs = [ alsaLib drumstick qtbase qtsvg ];
1515
pkgs/applications/audio/ladspa-plugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig
1+{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkg-config
22, perlPackages }:
33
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ];
1616
1717 patchPhase = ''
pkgs/applications/audio/lash/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2
2−, makeWrapper, pkgconfig, readline }:
2+, makeWrapper, pkg-config, readline }:
33
44assert libuuid != null;
55
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 patches = [ ./socket.patch ./gcc-47.patch ];
1717
1818 buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
19− pkgconfig readline ];
19+ pkg-config readline ];
2020 propagatedBuildInputs = [ libuuid ];
2121 NIX_LDFLAGS = "-lm -lpthread -luuid";
2222
pkgs/applications/audio/librespot/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
22, withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null
33, withPortAudio ? false, portaudio ? null }:
44
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
2929 ]))
3030 ];
3131
32− nativeBuildInputs = [ pkgconfig ];
32+ nativeBuildInputs = [ pkg-config ];
3333
3434 buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib
3535 ++ lib.optional withPulseAudio libpulseaudio
pkgs/applications/audio/linuxband/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }:
1+{ lib, stdenv, fetchurl, makeWrapper, pkg-config, MMA, libjack2, libsmf, python2Packages }:
22
33let
44 inherit (python2Packages) pyGtkGlade pygtksourceview python;
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
1616
1717 patchPhase = ''
pkgs/applications/audio/linuxsampler/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which
1+{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which
22, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 make -f Makefile.svn
1515 '';
1616
17− nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ];
17+ nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ];
1818
1919 buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ];
2020
pkgs/applications/audio/lmms/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13
22, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
33, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
44, qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:
@@ -15,7 +15,7 @@ mkDerivation rec {
1515 fetchSubmodules = true;
1616 };
1717
18− nativeBuildInputs = [ cmake qttools pkgconfig ];
18+ nativeBuildInputs = [ cmake qttools pkg-config ];
1919
2020 buildInputs = [
2121 alsaLib
pkgs/applications/audio/lollypop/default.nix+2−2
@@ -3,7 +3,7 @@
33, nix-update-script
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, python3
88, gtk3
99, gst_all_1
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
4343 gobject-introspection
4444 meson
4545 ninja
46− pkgconfig
46+ pkg-config
4747 wrapGAppsHook
4848 ];
4949
pkgs/applications/audio/lsp-plugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper
1+{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
22, libsndfile, jack2Full
33, libGLU, libGL, lv2, cairo
44, ladspaH, php }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1apw8zh3a3il4smkjji6bih4vbsymj0hjs10fgkrd4nazqkjvgyd";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig php makeWrapper ];
17+ nativeBuildInputs = [ pkg-config php makeWrapper ];
1818 buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ];
1919
2020 makeFlags = [
pkgs/applications/audio/ltc-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}:
1+{lib, stdenv, fetchFromGitHub, pkg-config, libltc, libsndfile, jack2}:
22
33stdenv.mkDerivation rec {
44 pname = "ltc-tools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al";
1212 };
1313
14− buildInputs = [ pkgconfig libltc libsndfile jack2 ];
14+ buildInputs = [ pkg-config libltc libsndfile jack2 ];
1515
1616 makeFlags = [ "PREFIX=$(out)" ];
1717
pkgs/applications/audio/luppp/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, jack2
77, cairo
88, liblo
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 nativeBuildInputs = [
2626 meson
2727 ninja
28− pkgconfig
28+ pkg-config
2929 ];
3030
3131 buildInputs = [
pkgs/applications/audio/lv2-cpp-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }:
1+{ lib, stdenv, fetchzip, pkg-config, lv2, gtkmm2, boost }:
22
33stdenv.mkDerivation rec {
44 pname = "lv2-cpp-tools";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template
1515 '';
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818
1919 buildInputs = [ lv2 gtkmm2 boost ];
2020
pkgs/applications/audio/lv2bm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }:
1+{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkg-config, serd, sord, sratom }:
22
33stdenv.mkDerivation rec {
44 pname = "lv2bm";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ glib libsndfile lilv lv2 serd sord sratom ];
1616
1717 installPhase = ''
pkgs/applications/audio/mda-lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }:
1+{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }:
22
33stdenv.mkDerivation rec {
44 pname = "mda-lv2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig wafHook python3 ];
12+ nativeBuildInputs = [ pkg-config wafHook python3 ];
1313 buildInputs = [ fftwSinglePrec lv2 ];
1414
1515 meta = with lib; {
pkgs/applications/audio/mellowplayer/default.nix+2−2
@@ -3,7 +3,7 @@
33, lib
44, libnotify
55, mkDerivation
6−, pkgconfig
6+, pkg-config
77, qtbase
88, qtdeclarative
99, qtgraphicaleffects
@@ -23,7 +23,7 @@ mkDerivation rec {
2323 sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs";
2424 };
2525
26− nativeBuildInputs = [ cmake pkgconfig ];
26+ nativeBuildInputs = [ cmake pkg-config ];
2727
2828 buildInputs = [
2929 libnotify
pkgs/applications/audio/meterbridge/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2
1+{ lib, stdenv, fetchurl, pkg-config, SDL, SDL_image, libjack2
22}:
33
44stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch];
1414
1515 buildInputs =
16− [ pkgconfig SDL SDL_image libjack2
16+ [ pkg-config SDL SDL_image libjack2
1717 ];
1818
1919 meta = with lib; {
pkgs/applications/audio/meters_lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }:
33
44let
@@ -25,7 +25,7 @@ in
2525stdenv.mkDerivation {
2626 inherit name;
2727
28− nativeBuildInputs = [ pkgconfig ];
28+ nativeBuildInputs = [ pkg-config ];
2929 buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ];
3030
3131 srcs = [ src robtkSrc ];
pkgs/applications/audio/mhwaveedit/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
2−, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
2+, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame
33, vorbis-tools }:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
1717
1818 preAutoreconf = "(cd docgen && sh gendocs.sh)";
1919
pkgs/applications/audio/milkytracker/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper
22, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
15+ nativeBuildInputs = [ cmake pkg-config makeWrapper ];
1616
1717 buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
1818
pkgs/applications/audio/mimic/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig
1+{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config
22, alsaLib, libtool, icu
33, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [
1717 autoreconfHook
18− pkgconfig
18+ pkg-config
1919 ];
2020
2121 buildInputs = [
pkgs/applications/audio/mixxx/default.nix+2−2
@@ -2,7 +2,7 @@
22, fftw, flac, faad2, glibcLocales, mp4v2
33, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
44, libGLU, libxcb, lilv, lv2, opusfile
5−, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
5+, pkg-config, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
66, qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk
77}:
88
@@ -31,7 +31,7 @@ mkDerivation rec {
3131 nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
3232 buildInputs = [
3333 chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile
34− libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
34+ libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkg-config portaudio portmidi protobuf qtbase qtscript qtsvg
3535 qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk
3636 ];
3737
pkgs/applications/audio/moc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, ncurses, db , popt, libtool
33# Sound sub-systems
44, alsaSupport ? true, alsaLib
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
4242 ++ opt withffmpeg4 ./moc-ffmpeg4.patch
4343 ++ opt pulseSupport ./pulseaudio.patch;
4444
45− nativeBuildInputs = [ pkgconfig ]
45+ nativeBuildInputs = [ pkg-config ]
4646 ++ opt pulseSupport autoreconfHook;
4747
4848 buildInputs = [ ncurses db popt libtool ]
pkgs/applications/audio/mp3info/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, lib, stdenv, ncurses, pkgconfig, gtk2 }:
1+{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "mp3info-0.8.5a";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ ncurses gtk2 ];
1313
1414 hardeningDisable = [ "format" ];
pkgs/applications/audio/mp3splt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libmp3splt }:
1+{ lib, stdenv, fetchurl, pkg-config, libmp3splt }:
22
33stdenv.mkDerivation rec {
44 pname = "mp3splt";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 configureFlags = [ "--enable-oggsplt-symlink" "--enable-flacsplt-symlink" ];
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libmp3splt ];
1616
1717 outputs = [ "out" "man" ];
pkgs/applications/audio/mpc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }:
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "mpc";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
1515
16− nativeBuildInputs = [ meson ninja pkgconfig sphinx ];
16+ nativeBuildInputs = [ meson ninja pkg-config sphinx ];
1717
1818 meta = with lib; {
1919 description = "A minimalist command line interface to MPD";
pkgs/applications/audio/muse/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook
22, alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo
33, libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord
44}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 patches = [ ./fix-parallel-building.patch ];
2424
25− nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ];
25+ nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
2626
2727 buildInputs = [
2828 alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo
pkgs/applications/audio/musescore/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
22, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
33, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
44, qtquickcontrols2, qtscript, qtsvg, qttools
@@ -31,7 +31,7 @@ mkDerivation rec {
3131 "--set QML_DISABLE_DISK_CACHE 1"
3232 ];
3333
34− nativeBuildInputs = [ cmake pkgconfig ];
34+ nativeBuildInputs = [ cmake pkg-config ];
3535
3636 buildInputs = [
3737 alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
pkgs/applications/audio/ncmpc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses
22, mpd_clientlib, gettext, boost
33, pcreSupport ? false
44, pcre ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 buildInputs = [ glib ncurses mpd_clientlib boost ]
2323 ++ optional pcreSupport pcre;
24− nativeBuildInputs = [ meson ninja pkgconfig gettext ];
24+ nativeBuildInputs = [ meson ninja pkg-config gettext ];
2525
2626 mesonFlags = [
2727 "-Dlirc=disabled"
pkgs/applications/audio/ncmpcpp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline
1+{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline
22, libiconv, icu, curl
33, outputsSupport ? true # outputs screen
44, visualizerSupport ? false, fftw ? null # visualizer screen
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ++ optional clockSupport "--enable-clock"
2626 ++ optional taglibSupport "--with-taglib";
2727
28− nativeBuildInputs = [ pkgconfig ];
28+ nativeBuildInputs = [ pkg-config ];
2929
3030 buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ]
3131 ++ optional visualizerSupport fftw
pkgs/applications/audio/ninjas2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }:
1+{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg, mesa, libsndfile, libsamplerate }:
22
33stdenv.mkDerivation rec {
44 pname = "ninjas2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 patchShebangs dpf/utils/generate-ttl.sh
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [
2121 libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate
2222 ];
pkgs/applications/audio/noise-repellent/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }:
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }:
22
33stdenv.mkDerivation rec {
44 pname = "noise-repellent";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
1616
17− nativeBuildInputs = [ meson ninja pkgconfig ];
17+ nativeBuildInputs = [ meson ninja pkg-config ];
1818 buildInputs = [
1919 fftwFloat lv2
2020 ];
pkgs/applications/audio/non/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2
1+{ lib, stdenv, fetchFromGitHub, pkg-config, python2, cairo, libjpeg, ntk, libjack2
22, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig wafHook ];
15+ nativeBuildInputs = [ pkg-config wafHook ];
1616 buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
1717 ladspaH liblo libsigcxx lrdf
1818 ];
pkgs/applications/audio/nova-filters/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }:
1+{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkg-config }:
22
33stdenv.mkDerivation {
44 version = "0.2-2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_0_1 ];
12+ nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ];
1313 buildInputs = [ boost ladspaH ];
1414
1515 patchPhase = ''
pkgs/applications/audio/openmpt123/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
1+{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
22, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
33
44let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 enableParallelBuilding = true;
1616 doCheck = true;
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ]
2020 ++ lib.optional usePulseAudio libpulseaudio;
2121
pkgs/applications/audio/opus-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}:
1+{lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}:
22
33stdenv.mkDerivation rec {
44 name = "opus-tools-0.2";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
77 sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl";
88 };
99
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [ libogg libao flac opusfile libopusenc ];
1212
1313 meta = {
pkgs/applications/audio/opusfile/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }:
1+{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }:
22
33stdenv.mkDerivation rec {
44 name = "opusfile-0.12";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
77 sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i";
88 };
99
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [ openssl libogg ];
1212 propagatedBuildInputs = [ libopus ];
1313 patches = [ ./include-multistream.patch ];
pkgs/applications/audio/padthv1/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
1+{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
22
33mkDerivation rec {
44 pname = "padthv1";
@@ -11,7 +11,7 @@ mkDerivation rec {
1111
1212 buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 meta = with lib; {
1717 description = "polyphonic additive synthesizer";
pkgs/applications/audio/pamix/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, pkgconfig, cmake
2+, pkg-config, cmake
33, libpulseaudio, ncurses }:
44
55stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg"
1818 '';
1919
20− nativeBuildInputs = [ cmake pkgconfig ];
20+ nativeBuildInputs = [ cmake pkg-config ];
2121 buildInputs = [ libpulseaudio ncurses ];
2222
2323 meta = with lib; {
pkgs/applications/audio/paprefs/default.nix+2−2
@@ -3,7 +3,7 @@
33, meson
44, ninja
55, gettext
6−, pkgconfig
6+, pkg-config
77, pulseaudioFull
88, glibmm
99, gtkmm3
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 meson
2323 ninja
2424 gettext
25− pkgconfig
25+ pkg-config
2626 wrapGAppsHook
2727 ];
2828
pkgs/applications/audio/parlatype/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }:
22
33stdenv.mkDerivation rec {
44 pname = "parlatype";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [
15− pkgconfig
15+ pkg-config
1616 meson
1717 ninja
1818 gettext
pkgs/applications/audio/patchage/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
2−, gtkmm2, libjack2, pkgconfig, python2, wafHook
2+, gtkmm2, libjack2, pkg-config, python2, wafHook
33}:
44
55stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 buildInputs = [
1515 alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
16− pkgconfig python2 wafHook
16+ pkg-config python2 wafHook
1717 ];
1818
1919 meta = {
pkgs/applications/audio/paulstretch/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch
22, audiofile, libvorbis, fltk, fftw, fftwFloat
3−, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate
3+, minixml, pkg-config, libmad, libjack2, portaudio, libsamplerate
44}:
55
66stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818
1919 buildInputs = [
2020 audiofile
pkgs/applications/audio/pavucontrol/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, intltool, libpulseaudio,
1+{ fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio,
22gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3
2323 gnome3.adwaita-icon-theme ];
2424
25− nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
25+ nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
2626
2727 configureFlags = [ "--disable-lynx" ];
2828
pkgs/applications/audio/pianobar/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, lib, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }:
1+{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_3, curl }:
22
33stdenv.mkDerivation rec {
44 name = "pianobar-2020.11.28";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [
1313 libao json_c libgcrypt ffmpeg_3 curl
1414 ];
pkgs/applications/audio/pithos/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
22, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection
33, libnotify, libsecret, gst_all_1 }:
44
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
2020 patchShebangs meson_post_install.py
2121 '';
2222
23− nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ];
23+ nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ];
2424
2525 propagatedBuildInputs =
2626 [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++
pkgs/applications/audio/plugin-torture/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
1+{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkg-config, serd, sord, sratom }:
22
33stdenv.mkDerivation {
44 pname = "plugin-torture";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ];
1616
1717 installPhase = ''
pkgs/applications/audio/polyphone/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
1+{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
22
33mkDerivation rec {
44 version = "2.2.0";
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 qtsvg
2323 ];
2424
25− nativeBuildInputs = [ qmake pkgconfig ];
25+ nativeBuildInputs = [ qmake pkg-config ];
2626
2727 preConfigure = ''
2828 cd ./sources/
pkgs/applications/audio/ponymix/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "ponymix";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [ libpulseaudio libnotify ];
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"'';
1818
pkgs/applications/audio/praat/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, alsaLib, gtk2, pkgconfig }:
1+{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "praat";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 cp praat $out/bin
1919 '';
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [ alsaLib gtk2 ];
2323
2424 meta = {
pkgs/applications/audio/projectm/default.nix+2−2
@@ -3,7 +3,7 @@
33, lib
44, fetchFromGitHub
55, autoreconfHook
6−, pkgconfig
6+, pkg-config
77, SDL2
88, qtdeclarative
99, libpulseaudio
@@ -23,7 +23,7 @@ mkDerivation rec {
2323 };
2424
2525 nativeBuildInputs = [
26− pkgconfig
26+ pkg-config
2727 autoreconfHook
2828 which
2929 ];
pkgs/applications/audio/pulseaudio-modules-bt/default.nix+2−2
@@ -2,7 +2,7 @@
22, runCommand
33, fetchFromGitHub
44, pulseaudio
5−, pkgconfig
5+, pkg-config
66, ffmpeg
77, patchelf
88, fdk_aac
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
4242 ];
4343
4444 nativeBuildInputs = [
45− pkgconfig
45+ pkg-config
4646 patchelf
4747 cmake
4848 ];
pkgs/applications/audio/pulseeffects/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, itstool
77, python3
88, libxml2
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
5757 nativeBuildInputs = [
5858 meson
5959 ninja
60− pkgconfig
60+ pkg-config
6161 libxml2
6262 itstool
6363 python3
pkgs/applications/audio/qmidinet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }:
1+{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }:
22
33mkDerivation rec {
44 version = "0.6.3";
@@ -13,7 +13,7 @@ mkDerivation rec {
1313
1414 buildInputs = [ qtbase qttools alsaLib libjack2 ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 meta = with lib; {
1919 description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
pkgs/applications/audio/qmidiroute/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, qt4, alsaLib }:
1+{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }:
22
33stdenv.mkDerivation rec {
44 version = "0.4.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ qt4 alsaLib ];
1414
1515 meta = with lib; {
pkgs/applications/audio/qmmp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper
1+{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper
22, qtbase, qttools, qtmultimedia, qtx11extras
33# transports
44, curl, libmms
@@ -36,7 +36,7 @@ mkDerivation rec {
3636 sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa";
3737 };
3838
39− nativeBuildInputs = [ cmake pkgconfig ];
39+ nativeBuildInputs = [ cmake pkg-config ];
4040 buildInputs =
4141 [ # basic requirements
4242 qtbase qttools qtmultimedia qtx11extras xlibsWrapper
pkgs/applications/audio/qsampler/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools
1+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools
22, liblscp, libgig, qtbase, mkDerivation }:
33
44mkDerivation rec {
@@ -10,7 +10,7 @@ mkDerivation rec {
1010 sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j";
1111 };
1212
13− nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
13+ nativeBuildInputs = [ autoconf automake libtool pkg-config qttools ];
1414 buildInputs = [ liblscp libgig qtbase ];
1515
1616 preConfigure = "make -f Makefile.svn";
pkgs/applications/audio/qsynth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig
1+{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config
22, mkDerivation, qtbase, qttools, qtx11extras
33}:
44
@@ -11,7 +11,7 @@ mkDerivation rec {
1111 sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv";
1212 };
1313
14− nativeBuildInputs = [ autoconf pkgconfig ];
14+ nativeBuildInputs = [ autoconf pkg-config ];
1515
1616 buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ];
1717
pkgs/applications/audio/qtscrobbler/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }:
1+{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }:
22
33stdenv.mkDerivation rec {
44 pname = "qtscrobbler";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba";
1010 };
1111
12− nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkgconfig which ];
12+ nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ];
1313 buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp;
1414
1515 enableParallelBuilding = true;
pkgs/applications/audio/radiotray-ng/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, cmake, pkgconfig
2+, cmake, pkg-config
33# Transport
44, curl
55# Libraries
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 sha256 = "1v2nsz7s0jj0wmqabzk6akcf1353rachm1lfq77hxbq9z5pw8pgb";
5050 };
5151
52− nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
52+ nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ];
5353
5454 buildInputs = [
5555 curl
pkgs/applications/audio/rhvoice/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, pkgconfig, fetchFromGitHub, sconsPackages
1+{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages
22, python, glibmm, libpulseaudio, libao }:
33
44let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 };
1616
1717 nativeBuildInputs = [
18− sconsPackages.scons_3_1_2 pkgconfig
18+ sconsPackages.scons_3_1_2 pkg-config
1919 ];
2020
2121 buildInputs = [
pkgs/applications/audio/rhythmbox/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, python3
33, perl
44, perlPackages
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
2727 };
2828
2929 nativeBuildInputs = [
30− pkgconfig
30+ pkg-config
3131 intltool perl perlPackages.XMLParser
3232 itstool
3333 wrapGAppsHook
pkgs/applications/audio/rosegarden/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook
1+{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook
22, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib
33, liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }:
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
1616 '';
1717
1818 nativeBuildInputs =
19− [ cmake makedepend perl pkgconfig qttools wrapQtAppsHook ];
19+ [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ];
2020
2121 buildInputs = [
2222 dssi
pkgs/applications/audio/samplv1/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, pkgconfig, libjack2
1+{ mkDerivation, lib, fetchurl, pkg-config, libjack2
22, alsaLib, liblo, libsndfile, lv2, qtbase, qttools
33, rubberband
44}:
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4=";
1313 };
1414
15− nativeBuildInputs = [ qttools pkgconfig ];
15+ nativeBuildInputs = [ qttools pkg-config ];
1616
1717 buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ];
1818
pkgs/applications/audio/seq24/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }:
1+{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "seq24";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 patches = [ ./mutex_no_nameclash.patch ];
1313
1414 buildInputs = [ alsaLib gtkmm2 libjack2 ];
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 meta = with lib; {
1818 description = "Minimal loop based midi sequencer";
pkgs/applications/audio/setbfree/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2
2−, libGLU, libGL, pkgconfig, ttf_bitstream_vera
2+, libGLU, libGL, pkg-config, ttf_bitstream_vera
33}:
44
55stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 -i b_synth/Makefile
1818 '';
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [
2222 alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL
2323 ttf_bitstream_vera
pkgs/applications/audio/sfizz/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "sfizz";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 buildInputs = [ libjack2 libsndfile ];
1818
pkgs/applications/audio/sfxr/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, desktop-file-utils
55, SDL
66, gtk3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 '';
3333
3434 nativeBuildInputs = [
35− pkgconfig
35+ pkg-config
3636 desktop-file-utils
3737 ];
3838
pkgs/applications/audio/sidplayfp/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, lib
33, fetchurl
4−, pkgconfig
4+, pkg-config
55, libsidplayfp
66, alsaSupport ? stdenv.hostPlatform.isLinux
77, alsaLib
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k";
2525 };
2626
27− nativeBuildInputs = [ pkgconfig ]
27+ nativeBuildInputs = [ pkg-config ]
2828 ++ optional alsaSupport alsaLib
2929 ++ optional pulseSupport libpulseaudio;
3030
pkgs/applications/audio/sisco.lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }:
1+{ lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }:
22
33let
44 name = "sisco.lv2-${version}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 srcs = [ src robtkSrc ];
2828 sourceRoot = src.name;
2929
30− nativeBuildInputs = [ pkgconfig ];
30+ nativeBuildInputs = [ pkg-config ];
3131 buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ];
3232
3333 postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
pkgs/applications/audio/snapcast/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
22, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr
33, nixosTests }:
44
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls";
4444 };
4545
46− nativeBuildInputs = [ cmake pkgconfig boost170.dev ];
46+ nativeBuildInputs = [ cmake pkg-config boost170.dev ];
4747 # snapcast also supports building against tremor but as we have libogg, that's
4848 # not needed
4949 buildInputs = [
pkgs/applications/audio/snd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, gtk2, alsaLib
33, fftw, gsl
44}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [
1717 gtk2 alsaLib
pkgs/applications/audio/sonic-lineup/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
22, libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate
33, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto
4−, wrapQtAppsHook, pkgconfig
4+, wrapQtAppsHook, pkg-config
55}:
66
77stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 portaudio rubberband serd sord capnproto
2020 ];
2121
22− nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
22+ nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
2323
2424 enableParallelBuilding = true;
2525
pkgs/applications/audio/sonic-pi/default.nix+2−2
@@ -6,7 +6,7 @@
66, ruby
77, aubio
88, cmake
9−, pkgconfig
9+, pkg-config
1010, boost
1111, bash
1212, jack2Full
@@ -35,7 +35,7 @@ mkDerivation rec {
3535 buildInputs = [
3636 bash
3737 cmake
38− pkgconfig
38+ pkg-config
3939 qtbase
4040 qwt
4141 ruby
pkgs/applications/audio/sooperlooper/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, which
66, libtool
77, liblo
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 ./autogen.sh
3535 '';
3636
37− nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ];
37+ nativeBuildInputs = [ autoreconfHook pkg-config which libtool ];
3838
3939 buildInputs = [
4040 liblo
pkgs/applications/audio/sound-juicer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero
1+{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero
22, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
33, gsettings-desktop-schemas, wrapGAppsHook }:
44
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
16+ nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
1717 buildInputs = [
1818 glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
1919 gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
pkgs/applications/audio/soundkonverter/default.nix+2−2
@@ -1,7 +1,7 @@
11# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
22{
33 mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper,
4− cmake, extra-cmake-modules, pkgconfig,
4+ cmake, extra-cmake-modules, pkg-config,
55 libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
66 qtbase, phonon,
77 taglib,
@@ -63,7 +63,7 @@ mkDerivation rec {
6363 })
6464 ];
6565
66− nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
66+ nativeBuildInputs = [ cmake extra-cmake-modules pkg-config kdelibs4support makeWrapper ];
6767 propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
6868 buildInputs = [ taglib ] ++ runtimeDeps;
6969 # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5
pkgs/applications/audio/soundscape-renderer/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchgit
33, autoreconfHook
44, help2man
5−, pkgconfig
5+, pkg-config
66, libsndfile
77, fftwFloat
88, libjack2
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
3232
3333 LC_ALL = "en_US.UTF-8";
3434
35− nativeBuildInputs = [ autoreconfHook pkgconfig ];
35+ nativeBuildInputs = [ autoreconfHook pkg-config ];
3636 buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
3737
3838 # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
pkgs/applications/audio/spectmorph/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }:
1+{ lib, stdenv, fetchurl, pkg-config, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }:
22
33stdenv.mkDerivation rec {
44 pname = "spectmorph";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with lib; {
1616 description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds";
pkgs/applications/audio/spectrojack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }:
1+{ lib, stdenv, fetchurl, pkg-config, libjack2, fftwFloat, gtk2 }:
22
33stdenv.mkDerivation rec {
44 pname = "spectrojack";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz";
99 sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp";
1010 };
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ libjack2 fftwFloat gtk2 ];
1313 configurePhase= ''
1414 sed -i 's/.*home.*/#&/' ./Makefile
pkgs/applications/audio/speech-denoiser/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, lv2, meson, ninja }:
22
33let
44 speech-denoiser-src = fetchFromGitHub {
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424
2525 src = speech-denoiser-src;
2626
27− nativeBuildInputs = [ pkgconfig meson ninja ];
27+ nativeBuildInputs = [ pkg-config meson ninja ];
2828 buildInputs = [ lv2 rnnoise-nu ];
2929
3030 mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
pkgs/applications/audio/spek/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "spek";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 # needed for autoreconfHook
1515 AUTOPOINT="intltoolize --automake --copy";
1616
17− nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
17+ nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
1818
1919 buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ];
2020
pkgs/applications/audio/spotify-tui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "spotify-tui";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f";
1515
16− nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkgconfig python3 ];
16+ nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
1717 buildInputs = [ ]
1818 ++ lib.optionals stdenv.isLinux [ openssl libxcb ]
1919 ++ lib.optionals stdenv.isDarwin [ AppKit Security ];
pkgs/applications/audio/spotifyd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, rustPackages, pkgconfig, openssl
1+{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
22, withALSA ? true, alsaLib ? null
33, withPulseAudio ? false, libpulseaudio ? null
44, withPortAudio ? false, portaudio ? null
@@ -26,7 +26,7 @@ rustPackages.rustPlatform.buildRustPackage rec {
2626 "${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}"
2727 ];
2828
29− nativeBuildInputs = [ pkgconfig ];
29+ nativeBuildInputs = [ pkg-config ];
3030
3131 buildInputs = [ openssl ]
3232 ++ lib.optional withALSA alsaLib
pkgs/applications/audio/squishyball/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses
2−, opusfile, pkgconfig
2+, opusfile, pkg-config
33}:
44
55stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1616
1717 buildInputs = [ flac libao libvorbis ncurses opusfile ];
1818
pkgs/applications/audio/stone-phaser/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "stone-phaser";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [
1717 xorg.libX11 cairo lv2 libjack2 mesa
1818 ];
pkgs/applications/audio/strawberry/default.nix+2−2
@@ -3,7 +3,7 @@
33, lib
44, fetchFromGitHub
55, cmake
6−, pkgconfig
6+, pkg-config
77, alsaLib
88, boost
99, chromaprint
@@ -77,7 +77,7 @@ mkDerivation rec {
7777 ])
7878 ++ lib.optional withVlc libvlc;
7979
80− nativeBuildInputs = [ cmake ninja pkgconfig qttools ];
80+ nativeBuildInputs = [ cmake ninja pkg-config qttools ];
8181
8282 cmakeFlags = [
8383 "-DUSE_SYSTEM_TAGLIB=ON"
pkgs/applications/audio/streamripper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:
1+{ lib, stdenv, fetchurl , glib, pkg-config, libogg, libvorbis, libmad }:
22
33stdenv.mkDerivation rec {
44 pname = "streamripper";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ glib libogg libvorbis libmad ];
1414
1515 meta = with lib; {
pkgs/applications/audio/swh-lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
1+{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "swh-lv2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
1515 '';
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [ fftwSinglePrec lv2 ];
1919
2020 installPhase = "make install-system";
pkgs/applications/audio/synthv1/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
1+{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
22
33mkDerivation rec {
44 pname = "synthv1";
@@ -11,7 +11,7 @@ mkDerivation rec {
1111
1212 buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 meta = with lib; {
1717 description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
pkgs/applications/audio/talentedhack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "talentedhack";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ lv2 fftwFloat ];
1717
pkgs/applications/audio/timemachine/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2
1+{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk2
22, libjack2, libsndfile
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ autoconf automake gtk2 libjack2
1717 libsndfile
1818 ];
pkgs/applications/audio/tony/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, wrapQtAppsHook
1+{ lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook
22, alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag
33, libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate
44, libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
15+ nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
1616
1717 buildInputs = [
1818 alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag
pkgs/applications/audio/transcode/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2
2−, lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }:
2+, lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }:
33
44stdenv.mkDerivation rec {
55 name = "transcode-1.1.7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
12− libdvdread pkgconfig x264 libmpeg2 xvidcore ];
12+ libdvdread pkg-config x264 libmpeg2 xvidcore ];
1313 configureFlags = [
1414 "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat"
1515 "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2"
pkgs/applications/audio/traverso/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig
1+{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config
22, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
33, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
44}:
@@ -11,7 +11,7 @@ mkDerivation {
1111 sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515 buildInputs = [ alsaLib fftw flac.dev libjack2 lame
1616 libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis
1717 portaudio qtbase wavpack ];
pkgs/applications/audio/uade123/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, which, libao, pkgconfig }:
1+{ lib, stdenv, fetchurl, which, libao, pkg-config }:
22
33let
44 version = "2.13";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
99 url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
1010 sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
1111 };
12− nativeBuildInputs = [ pkgconfig which ];
12+ nativeBuildInputs = [ pkg-config which ];
1313 buildInputs = [ libao ];
1414
1515 enableParallelBuilding = true;
pkgs/applications/audio/vcv-rack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig
1+{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config
22, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
33, libzip, rtaudio, rtmidi, speex, libsamplerate }:
44
@@ -74,7 +74,7 @@ with lib; stdenv.mkDerivation rec {
7474
7575 enableParallelBuilding = true;
7676
77− nativeBuildInputs = [ makeWrapper pkgconfig ];
77+ nativeBuildInputs = [ makeWrapper pkg-config ];
7878 buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
7979
8080 buildFlags = [ "Rack" ];
pkgs/applications/audio/vimpc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config
22, taglib, curl }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1616 buildInputs = [ mpd_clientlib ncurses pcre taglib curl ];
1717
1818 postInstall = ''
pkgs/applications/audio/vocal/default.nix+2−2
@@ -4,7 +4,7 @@
44, cmake
55, ninja
66, vala
7−, pkgconfig
7+, pkg-config
88, pantheon
99, gtk3
1010, glib
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 libxml2
3939 ninja
4040 vala
41− pkgconfig
41+ pkg-config
4242 wrapGAppsHook
4343 ];
4444
pkgs/applications/audio/vocproc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
1+{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
22
33stdenv.mkDerivation rec {
44 pname = "vocproc";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ];
1515
pkgs/applications/audio/vorbis-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl
1+{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl
22, speex, flac }:
33
44let
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 done
2121 '';
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424 buildInputs = [ libogg libvorbis libao curl speex flac ];
2525
2626 meta = with lib; {
pkgs/applications/audio/waon/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate
2−, libsndfile, ncurses, pkgconfig
2+, libsndfile, ncurses, pkg-config
33}:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ fftw gtk2 libao libsamplerate libsndfile ncurses ];
1818
1919 installPhase = ''
pkgs/applications/audio/wolf-shaper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "wolf-shaper";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ];
1717
1818 makeFlags = [
pkgs/applications/audio/x42-avldrums/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, glib, libGLU, lv2, pango }:
22
33stdenv.mkDerivation rec {
44 pname = "x42-avldrums";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ cairo glib libGLU lv2 pango ];
1717
1818 makeFlags = [
pkgs/applications/audio/x42-gmsynth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, lv2 }:
22
33stdenv.mkDerivation rec {
44 pname = "x42-gmsynth";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ glib lv2 ];
1616
1717 makeFlags = [
pkgs/applications/audio/x42-plugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
33, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
1616
1717 # Don't remove this. The default fails with 'do not know how to unpack source archive'
pkgs/applications/audio/xmp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
1+{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }:
22
33stdenv.mkDerivation rec {
44 name = "xmp-4.1.0";
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
1515 sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ alsaLib libxmp ];
2020}
pkgs/applications/audio/xsynth-dssi/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2,
2−ladspaH, ladspaPlugins, liblo, pkgconfig }:
2+ladspaH, ladspaPlugins, liblo, pkg-config }:
33
44stdenv.mkDerivation rec {
55 pname = "xsynth-dssi";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH
14− ladspaPlugins liblo pkgconfig ];
14+ ladspaPlugins liblo pkg-config ];
1515
1616 installPhase = ''
1717 mkdir -p $out/bin
pkgs/applications/audio/yoshimi/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
2−, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg
2+, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg
33}:
44
55assert stdenv ? glibc;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 minixml zlib xorg.libpthreadstubs pcre
2121 ];
2222
23− nativeBuildInputs = [ cmake pkgconfig ];
23+ nativeBuildInputs = [ cmake pkg-config ];
2424
2525 patchPhase = ''
2626 substituteInPlace src/Misc/Config.cpp --replace /usr $out
pkgs/applications/audio/zam-plugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
1+{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkg-config, rubberband, libsndfile, fftwFloat, libsamplerate }:
22
33stdenv.mkDerivation rec {
44 pname = "zam-plugins";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
1717
1818 postPatch = ''
pkgs/applications/blockchains/aeon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz
22, boost, miniupnpc, openssl, unbound, cppzmq
33, zeromq, pcsclite, readline, libsodium
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch";
1919 };
2020
21− nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];
21+ nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ];
2222
2323 buildInputs = [
2424 boost miniupnpc openssl unbound
pkgs/applications/blockchains/bitcoin-abc.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost
1+{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost
22, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent
33, withGui, python3, jemalloc, zeromq4 }:
44
@@ -18,7 +18,7 @@ mkDerivation rec {
1818
1919 patches = [ ./fix-bitcoin-qt-build.patch ];
2020
21− nativeBuildInputs = [ pkgconfig cmake ];
21+ nativeBuildInputs = [ pkg-config cmake ];
2222 buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4
2323 miniupnpc util-linux protobuf libevent ]
2424 ++ optionals withGui [ qtbase qttools qrencode ];
pkgs/applications/blockchains/bitcoin-classic.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
1+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost
22, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent
33, withGui }:
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig autoreconfHook ];
19+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2020 buildInputs = [ openssl db48 boost zlib
2121 miniupnpc util-linux protobuf libevent ]
2222 ++ optionals withGui [ qtbase qttools qrencode ];
pkgs/applications/blockchains/bitcoin-gold.nix+2−2
@@ -5,7 +5,7 @@
55, libevent
66, autoreconfHook
77, db4
8−, pkgconfig
8+, pkg-config
99, protobuf
1010, hexdump
1111, zeromq
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [
3434 autoreconfHook
35− pkgconfig
35+ pkg-config
3636 hexdump
3737 ] ++ optionals withGui [
3838 wrapQtAppsHook
pkgs/applications/blockchains/bitcoin-knots.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3−, pkgconfig
3+, pkg-config
44, autoreconfHook
55, db5
66, openssl
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj";
2525 };
2626
27− nativeBuildInputs = [ pkgconfig autoreconfHook ];
27+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2828 buildInputs = [ openssl db5 openssl util-linux
2929 protobuf boost zlib miniupnpc libevent ];
3030
pkgs/applications/blockchains/bitcoin-unlimited.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
1+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost
22, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
33, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
44, Foundation, ApplicationServices, AppKit }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
19+ nativeBuildInputs = [ pkg-config autoreconfHook python3 ]
2020 ++ optionals withGui [ wrapQtAppsHook qttools ];
2121 buildInputs = [ openssl db48 boost zlib
2222 miniupnpc util-linux protobuf libevent ]
pkgs/applications/blockchains/btcdeb/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, openssl
66}:
77
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig autoreconfHook ];
20+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2121 buildInputs = [ openssl ];
2222
2323 meta = {
pkgs/applications/blockchains/cgminer/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3−, pkgconfig
3+, pkg-config
44, libtool
55, autoconf
66, automake
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5";
2424 };
2525
26− nativeBuildInputs = [ pkgconfig ];
26+ nativeBuildInputs = [ pkg-config ];
2727 buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers
2828 xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ];
2929
pkgs/applications/blockchains/clightning.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
1+{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake,
22 autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }:
33
44with lib;
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 enableParallelBuilding = true;
1515
16− nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip gettext ];
16+ nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ];
1717 buildInputs =
1818 let py3 = python3.withPackages (p: [ p.Mako ]);
1919 in [ sqlite gmp zlib py3 ];
pkgs/applications/blockchains/dashpay.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook
1+{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook
22, openssl, db48, boost, zlib, miniupnpc
33, qrencode, glib, protobuf, yasm, libevent
44, util-linux
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa";
1919 };
2020
21− nativeBuildInputs = [ pkgconfig autoreconfHook ];
21+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2222 buildInputs = [ glib openssl db48 yasm boost zlib libevent
2323 miniupnpc protobuf qrencode util-linux ];
2424
pkgs/applications/blockchains/dero.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
22, lmdb, miniupnpc, readline }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
1717
1818 meta = with lib; {
pkgs/applications/blockchains/digibyte.nix+2−2
@@ -5,7 +5,7 @@
55, libevent
66, autoreconfHook
77, db4
8−, pkgconfig
8+, pkg-config
99, protobuf
1010, hexdump
1111, zeromq
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [
3434 autoreconfHook
35− pkgconfig
35+ pkg-config
3636 hexdump
3737 ] ++ optionals withGui [
3838 wrapQtAppsHook
pkgs/applications/blockchains/dogecoin.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv , fetchFromGitHub
2−, pkgconfig, autoreconfHook
2+, pkg-config, autoreconfHook
33, db5, openssl, boost, zlib, miniupnpc, libevent
44, protobuf, util-linux, qt4, qrencode
55, withGui }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig autoreconfHook ];
19+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2020 buildInputs = [ openssl db5 openssl util-linux
2121 protobuf boost zlib miniupnpc libevent ]
2222 ++ optionals withGui [ qt4 qrencode ];
pkgs/applications/blockchains/litecoin.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, mkDerivation, fetchFromGitHub
2−, pkgconfig, autoreconfHook
2+, pkg-config, autoreconfHook
33, openssl, db48, boost, zlib, miniupnpc
44, glib, protobuf, util-linux, qrencode
55, AppKit
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c";
2323 };
2424
25− nativeBuildInputs = [ pkgconfig autoreconfHook ];
25+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2626 buildInputs = [ openssl db48 boost zlib zeromq
2727 miniupnpc glib protobuf util-linux libevent ]
2828 ++ optionals stdenv.isDarwin [ AppKit ]
pkgs/applications/blockchains/masari.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
22, lmdb, miniupnpc, readline }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
1717
1818 meta = with lib; {
pkgs/applications/blockchains/monero-gui/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, wrapQtAppsHook, makeDesktopItem
22, fetchFromGitHub
3−, cmake, qttools, pkgconfig
3+, cmake, qttools, pkg-config
44, qtbase, qtdeclarative, qtgraphicaleffects
55, qtmultimedia, qtxmlpatterns
66, qtquickcontrols, qtquickcontrols2
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 };
3939
4040 nativeBuildInputs = [
41− cmake pkgconfig wrapQtAppsHook
41+ cmake pkg-config wrapQtAppsHook
4242 (getDev qttools)
4343 ];
4444
pkgs/applications/blockchains/monero/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch
2−, cmake, pkgconfig
2+, cmake, pkg-config
33, boost, miniupnpc, openssl, unbound
44, zeromq, pcsclite, readline, libsodium, hidapi
55, randomx, rapidjson
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 cp -r . $source
3939 '';
4040
41− nativeBuildInputs = [ cmake pkgconfig ];
41+ nativeBuildInputs = [ cmake pkg-config ];
4242
4343 buildInputs = [
4444 boost miniupnpc openssl unbound
pkgs/applications/blockchains/namecoin.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump
1+{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump
22, withGui }:
33
44with lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [
1717 autoreconfHook
18− pkgconfig
18+ pkg-config
1919 hexdump
2020 ];
2121
pkgs/applications/blockchains/nano-wallet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
22, qtbase}:
33
44stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 optionToFlag = name: value: "-D${name}=${value}";
3434 in lib.mapAttrsToList optionToFlag options;
3535
36− nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
36+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
3737 buildInputs = [ boost libGL qtbase ];
3838
3939 buildPhase = ''
pkgs/applications/blockchains/particl/particl-core.nix+2−2
@@ -6,7 +6,7 @@
66, libevent
77, miniupnpc
88, openssl
9−, pkgconfig
9+, pkg-config
1010, zeromq
1111, zlib
1212, unixtools
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl";
2525 };
2626
27− nativeBuildInputs = [ pkgconfig autoreconfHook ];
27+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2828 buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ];
2929
3030 configureFlags = [
pkgs/applications/blockchains/pivx.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null
1+{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null
22, openssl, db48, boost, zlib, miniupnpc, gmp
33, qrencode, glib, protobuf, yasm, libevent
44, util-linux, qtbase ? null, qttools ? null
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy";
2020 };
2121
22− nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
22+ nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
2323 buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ]
2424 ++ optionals withGui [ qtbase qttools qrencode ];
2525
pkgs/applications/blockchains/stellar-core.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git
1+{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkg-config, git
22, bison, flex, postgresql }:
33
44let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
1616 leaveDotGit = true;
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ autoconf automake libtool git ];
2121
2222 propagatedBuildInputs = [ bison flex postgresql ];
pkgs/applications/blockchains/vertcoin.nix+2−2
@@ -5,7 +5,7 @@
55, libevent
66, autoreconfHook
77, db4
8−, pkgconfig
8+, pkg-config
99, protobuf
1010, hexdump
1111, zeromq
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [
3434 autoreconfHook
35− pkgconfig
35+ pkg-config
3636 hexdump
3737 ] ++ optionals withGui [
3838 wrapQtAppsHook
pkgs/applications/editors/amp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin
22, curl }:
33
44rustPlatform.buildRustPackage rec {
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414
1515 cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf";
1616
17− nativeBuildInputs = [ cmake pkgconfig python3 ];
17+ nativeBuildInputs = [ cmake pkg-config python3 ];
1818 buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin
1919 (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]);
2020
pkgs/applications/editors/apostrophe/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake
2−, wrapGAppsHook, pkgconfig, desktop-file-utils
2+, wrapGAppsHook, pkg-config, desktop-file-utils
33, appstream-glib, pythonPackages, glib, gobject-introspection
44, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
55, shared-mime-info, haskellPackages}:
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121 sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879";
2222 };
2323
24− nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils
24+ nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils
2525 appstream-glib wrapGAppsHook ];
2626
2727 buildInputs = [ glib pythonEnv gobject-introspection gtk3
pkgs/applications/editors/aseprite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkgconfig
1+{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config
22, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
33, harfbuzzFull, glib, fontconfig, pcre
44, libX11, libXext, libXcursor, libXxf86vm, libGL
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 };
2929
3030 nativeBuildInputs = [
31− cmake pkgconfig
31+ cmake pkg-config
3232 ] ++ lib.optionals unfree [ ninja ];
3333
3434 buildInputs = [
pkgs/applications/editors/bless/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, mono
66, gtk-sharp-2_0
77, gettext
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 ];
3333
3434 nativeBuildInputs = [
35− pkgconfig
35+ pkg-config
3636 autoreconfHook
3737 gettext
3838 makeWrapper
pkgs/applications/editors/bluefish/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2
1+{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2
22, enchant, gucharmap, python, gnome3
33}:
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d";
1111 };
1212
13− nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
13+ nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
1414 buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
1515 enchant gucharmap python ];
1616
pkgs/applications/editors/codeblocks/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2
1+{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkg-config, file, zip, wxGTK, gtk2
22, contribPlugins ? false, hunspell, gamin, boost
33}:
44
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k";
1515 };
1616
17− nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ];
17+ nativeBuildInputs = [ autoreconfHook pkg-config libtool file zip ];
1818 buildInputs = [ wxGTK gtk2 ]
1919 ++ optionals contribPlugins [ hunspell gamin boost ];
2020 enableParallelBuilding = true;
pkgs/applications/editors/edit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }:
1+{ lib, stdenv, fetchgit, unzip, pkg-config, ncurses, libX11, libXft, cwebbin }:
22
33stdenv.mkDerivation {
44 pname = "edit-nightly";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212
1313 buildInputs = [
1414 unzip
15− pkgconfig
15+ pkg-config
1616 ncurses
1717 libX11
1818 libXft
pkgs/applications/editors/emacs-modes/melpa-packages.nix+2−2
@@ -144,7 +144,7 @@ let
144144 flycheck-rtags = fix-rtags super.flycheck-rtags;
145145
146146 pdf-tools = super.pdf-tools.overrideAttrs (old: {
147− nativeBuildInputs = [ external.pkgconfig ];
147+ nativeBuildInputs = [ external.pkg-config ];
148148 buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
149149 preBuild = "make server/epdfinfo";
150150 recipe = pkgs.writeText "recipe" ''
@@ -373,7 +373,7 @@ let
373373 nativeBuildInputs = [
374374 external.autoconf
375375 external.automake
376− external.pkgconfig
376+ external.pkg-config
377377 external.libtool
378378 (external.zeromq.override { enableDrafts = true; })
379379 ];
pkgs/applications/editors/emacs/generic.nix+2−2
@@ -7,7 +7,7 @@
77 , patches ? [ ]
88}:
99{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
10−, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
10+, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif
1111, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
1212, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
1313, jansson, harfbuzz
@@ -92,7 +92,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
9292 ""
9393 ];
9494
95− nativeBuildInputs = [ pkgconfig makeWrapper ]
95+ nativeBuildInputs = [ pkg-config makeWrapper ]
9696 ++ lib.optionals srcRepo [ autoreconfHook texinfo ]
9797 ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
9898
pkgs/applications/editors/emacs/macport.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson
1+{ lib, stdenv, fetchurl, ncurses, pkg-config, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson
22, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
33, ImageCaptureCore, GSS, ImageIO # These may be optional
44}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030
3131 enableParallelBuilding = true;
3232
33− nativeBuildInputs = [ pkgconfig autoconf automake ];
33+ nativeBuildInputs = [ pkg-config autoconf automake ];
3434
3535 buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson
3636 AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
pkgs/applications/editors/featherpad/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
1+{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
22mkDerivation rec {
33 pname = "featherpad";
44 version = "0.10.0";
@@ -10,7 +10,7 @@ mkDerivation rec {
1010 sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p";
1111 };
1212
13− nativeBuildInputs = [ qmake pkgconfig qttools ];
13+ nativeBuildInputs = [ qmake pkg-config qttools ];
1414 buildInputs = [ qtbase qtsvg qtx11extras ];
1515
1616 meta = with lib; {
pkgs/applications/editors/focuswriter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
1+{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
22
33mkDerivation rec {
44 pname = "focuswriter";
@@ -9,7 +9,7 @@ mkDerivation rec {
99 sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig qmake qttools ];
12+ nativeBuildInputs = [ pkg-config qmake qttools ];
1313 buildInputs = [ hunspell qtbase qtmultimedia ];
1414
1515 enableParallelBuilding = true;
pkgs/applications/editors/geany/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, gtk3
44, which
5−, pkgconfig
5+, pkg-config
66, intltool
77, file
88, libintl
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 };
2323
2424 nativeBuildInputs = [
25− pkgconfig
25+ pkg-config
2626 intltool
2727 libintl
2828 which
pkgs/applications/editors/ghostwriter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }:
1+{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, qttools, qtwebengine, hunspell }:
22
33mkDerivation rec {
44 pname = "ghostwriter";
@@ -11,7 +11,7 @@ mkDerivation rec {
1111 sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg=";
1212 };
1313
14− nativeBuildInputs = [ qmake pkgconfig qttools ];
14+ nativeBuildInputs = [ qmake pkg-config qttools ];
1515
1616 buildInputs = [ qtwebengine hunspell ];
1717
pkgs/applications/editors/gnome-builder/default.nix+2−2
@@ -25,7 +25,7 @@
2525, ostree
2626, pcre
2727, pcre2
28−, pkgconfig
28+, pkg-config
2929, python3
3030, sysprof
3131, template-glib
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 gtk-doc
5757 meson
5858 ninja
59− pkgconfig
59+ pkg-config
6060 python3
6161 python3.pkgs.wrapPython
6262 wrapGAppsHook
pkgs/applications/editors/gnome-latex/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
2−, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
2+, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }:
33let
44 version = "3.38.0";
55 pname = "gnome-latex";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 configureFlags = ["--disable-dconf-migration"];
1616
1717 nativeBuildInputs = [
18− pkgconfig
18+ pkg-config
1919 wrapGAppsHook
2020 itstool
2121 intltool
pkgs/applications/editors/gobby/default.nix+2−2
@@ -1,5 +1,5 @@
11{ avahiSupport ? false # build support for Avahi in libinfinity
2−, lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools
2+, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools
33, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
44
55let
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
1313 sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az";
1414 };
1515
16− nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ];
16+ nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ];
1717 buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
1818
1919 preConfigure = "./autogen.sh";
pkgs/applications/editors/howl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }:
1+{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }:
22
33with lib;
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # The Makefile uses "/usr/local" if not explicitly overridden
1818 installFlags = [ "PREFIX=$(out)" ];
1919
20− nativeBuildInputs = [ makeWrapper pkgconfig ];
20+ nativeBuildInputs = [ makeWrapper pkg-config ];
2121 buildInputs = [ gtk3 librsvg ];
2222 enableParallelBuilding = true;
2323
pkgs/applications/editors/jucipp/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
2− boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
2+ boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre,
33 libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
44 coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
55
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq";
2525 };
2626
27− nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
27+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
2828 buildInputs = [
2929 dbus
3030 openssl
pkgs/applications/editors/kakoune/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkg-config }:
22
33with lib;
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 rev = "v${version}";
1212 sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i";
1313 };
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
1616 makeFlags = [ "debug=no" ];
1717
pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }:
1+{ lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }:
22
33let
44 pname = "kdevelop-pg-qt";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
1414 };
1515
16− nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
16+ nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ];
1717
1818 buildInputs = [ qtbase ];
1919
pkgs/applications/editors/kdevelop5/kdevelop.nix+2−2
@@ -1,5 +1,5 @@
11
2−{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
2+{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules
33, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase
44, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
55, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -18,7 +18,7 @@ mkDerivation rec {
1818 };
1919
2020 nativeBuildInputs = [
21− cmake gettext pkgconfig extra-cmake-modules makeWrapper
21+ cmake gettext pkg-config extra-cmake-modules makeWrapper
2222 ];
2323
2424 buildInputs = [
pkgs/applications/editors/leafpad/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2 }:
1+{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }:
22
33stdenv.mkDerivation rec {
44 version = "0.8.18.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ intltool gtk2 ];
1313
1414 hardeningDisable = [ "format" ];
pkgs/applications/editors/mg/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }:
22
33stdenv.mkDerivation rec {
44 pname = "mg";
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
1313
1414 enableParallelBuilding = true;
1515
16− makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" ];
16+ makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ];
1717
1818 installPhase = ''
1919 install -m 555 -Dt $out/bin mg
2020 install -m 444 -Dt $out/share/man/man1 mg.1
2121 '';
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323
2424 buildInputs = [ ncurses ];
2525
pkgs/applications/editors/monodevelop/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl
2−, autoconf, automake, pkgconfig, shared-mime-info, intltool
2+, autoconf, automake, pkg-config, shared-mime-info, intltool
33, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
44, dotnetPackages
55}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 patchFlags = [ "-p2" ];
3535 patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
3636
37− nativeBuildInputs = [ pkgconfig ];
37+ nativeBuildInputs = [ pkg-config ];
3838 buildInputs = [
3939 autoconf automake shared-mime-info intltool
4040 mono gtk-sharp-2_0 gnome-sharp unzip
pkgs/applications/editors/neovim/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
2−, libuv, lua, ncurses, pkgconfig
2+, libuv, lua, ncurses, pkg-config
33, unibilium, xsel, gperf
44, libvterm-neovim
55, glibcLocales ? null, procps ? null
@@ -74,7 +74,7 @@ in
7474 nativeBuildInputs = [
7575 cmake
7676 gettext
77− pkgconfig
77+ pkg-config
7878 ];
7979
8080 # extra programs test via `make functionaltest`
pkgs/applications/editors/notepadqq/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
1+{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }:
22
33mkDerivation rec {
44 pname = "notepadqq";
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [
15− pkgconfig which qttools
15+ pkg-config which qttools
1616 ];
1717
1818 buildInputs = [
pkgs/applications/editors/quilter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala
1+{ lib, stdenv, fetchFromGitHub, nix-update-script, pkg-config, meson, ninja, python3, vala
22, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
33, libgee, discount, wrapGAppsHook }:
44
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 meson
1919 ninja
2020 vala
21− pkgconfig
21+ pkg-config
2222 python3
2323 wrapGAppsHook
2424 ];
pkgs/applications/editors/scite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, gtk2 }:
1+{ lib, stdenv, fetchurl, pkg-config, gtk2 }:
22
33stdenv.mkDerivation {
44 pname = "scite";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ gtk2 ];
1414 sourceRoot = "scintilla/gtk";
1515
pkgs/applications/editors/sigil/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper
1+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper
22, boost, xercesc, hunspell, zlib, pcre16
33, qtbase, qttools, qtwebengine, qtxmlpatterns
44, python3Packages
@@ -17,7 +17,7 @@ mkDerivation rec {
1717
1818 pythonPath = with python3Packages; [ lxml ];
1919
20− nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
20+ nativeBuildInputs = [ cmake pkg-config makeWrapper ];
2121
2222 buildInputs = [
2323 boost xercesc qtbase qttools qtwebengine qtxmlpatterns
pkgs/applications/editors/supertux-editor/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
1+{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }:
22stdenv.mkDerivation {
33 version = "git-2014-08-20";
44 pname = "supertux-editor";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];
1515
1616 installPhase = ''
pkgs/applications/editors/texmacs/default.nix+2−2
@@ -7,7 +7,7 @@
77 git ? null,
88 python3 ? null,
99 cmake,
10− pkgconfig,
10+ pkg-config,
1111 ghostscriptX ? null,
1212 extraFonts ? false,
1313 chineseFonts ? false,
@@ -31,7 +31,7 @@ mkDerivation {
3131 sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105";
3232 };
3333
34− nativeBuildInputs = [ cmake pkgconfig ];
34+ nativeBuildInputs = [ cmake pkg-config ];
3535 buildInputs = [
3636 guile_1_8
3737 qtbase
pkgs/applications/editors/texmaker/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
1+{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }:
22
33mkDerivation rec {
44 pname = "texmaker";
@@ -10,7 +10,7 @@ mkDerivation rec {
1010 };
1111
1212 buildInputs = [ qtbase qtscript poppler zlib ];
13− nativeBuildInputs = [ pkgconfig poppler qmake ];
13+ nativeBuildInputs = [ pkg-config poppler qmake ];
1414 NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
1515
1616 qmakeFlags = [
pkgs/applications/editors/texstudio/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg,
2− wrapQtAppsHook, poppler, zlib, pkgconfig }:
2+ wrapQtAppsHook, poppler, zlib, pkg-config }:
33
44mkDerivation rec {
55 pname = "texstudio";
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7";
1313 };
1414
15− nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
15+ nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
1616 buildInputs = [ qtbase qtscript qtsvg poppler zlib ];
1717
1818 qmakeFlags = [ "NO_APPDATA=True" ];
pkgs/applications/editors/textadept/10/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
1+{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
22
33stdenv.mkDerivation rec {
44 version = "10.8";
55 pname = "textadept";
66
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 buildInputs = [
99 gtk2 ncurses glib unzip zip
1010 ];
pkgs/applications/editors/textadept/11/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
1+{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
22
33stdenv.mkDerivation rec {
44 version = "11.0_beta";
55 pname = "textadept11";
66
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 buildInputs = [
99 gtk2 ncurses glib unzip zip
1010 ];
pkgs/applications/editors/tiled/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake
1+{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake
22, python, qtbase, qttools }:
33
44mkDerivation rec {
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig qmake ];
15+ nativeBuildInputs = [ pkg-config qmake ];
1616 buildInputs = [ python qtbase qttools ];
1717
1818 enableParallelBuilding = true;
pkgs/applications/editors/vim/configurable.nix+2−2
@@ -1,4 +1,4 @@
1−{ source ? "default", callPackage, lib, stdenv, ncurses, pkgconfig, gettext
1+{ source ? "default", callPackage, lib, stdenv, ncurses, pkg-config, gettext
22, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby
33, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
44, libICE
@@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
119119 ++ lib.optional ximSupport "--enable-xim";
120120
121121 nativeBuildInputs = [
122− pkgconfig
122+ pkg-config
123123 ]
124124 ++ lib.optional wrapPythonDrv makeWrapper
125125 ++ lib.optional nlsSupport gettext
pkgs/applications/editors/vim/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig
1+{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config
22# default vimrc
33, vimrc ? fetchurl {
44 name = "default-vimrc";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717
1818 inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
1919
20− nativeBuildInputs = [ gettext pkgconfig ];
20+ nativeBuildInputs = [ gettext pkg-config ];
2121 buildInputs = [ ncurses ]
2222 ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ];
2323
pkgs/applications/editors/vim/macvim.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext
2−, pkgconfig, cscope, ruby, tcl, perl, luajit
2+, pkg-config, cscope, ruby, tcl, perl, luajit
33, darwin
44
55, usePython27 ? false
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
3838
3939 enableParallelBuilding = true;
4040
41− nativeBuildInputs = [ pkgconfig buildSymlinks ];
41+ nativeBuildInputs = [ pkg-config buildSymlinks ];
4242 buildInputs = [
4343 gettext ncurses cscope luajit ruby tcl perl python.pkg
4444 ];
pkgs/applications/editors/vis/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
1+{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem
22, ncurses, libtermkey, lpeg, lua
33, acl ? null, libselinux ? null
44}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 owner = "martanne";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig makeWrapper ];
17+ nativeBuildInputs = [ pkg-config makeWrapper ];
1818
1919 buildInputs = [
2020 ncurses
pkgs/applications/gis/grass/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
1+{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
22, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas
33, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
44}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
2121 readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
2222 libLAS proj-datumgrid ]
pkgs/applications/graphics/ImageMagick/7.0.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool
1+{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
22, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
33, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
44, ApplicationServices
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
5050 [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
5151 ;
5252
53− nativeBuildInputs = [ pkgconfig libtool ];
53+ nativeBuildInputs = [ pkg-config libtool ];
5454
5555 buildInputs =
5656 [ zlib fontconfig freetype ghostscript
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
7272 moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
7373 for file in "$dev"/bin/*-config; do
7474 substituteInPlace "$file" --replace pkg-config \
75− "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'"
75+ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
7676 done
7777 '' + lib.optionalString (ghostscript != null) ''
7878 for la in $out/lib/*.la; do
pkgs/applications/graphics/ImageMagick/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool
22, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
33, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
44, ApplicationServices
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
6262 [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
6363 ;
6464
65− nativeBuildInputs = [ pkgconfig libtool ];
65+ nativeBuildInputs = [ pkg-config libtool ];
6666
6767 buildInputs =
6868 [ zlib fontconfig freetype ghostscript
@@ -85,10 +85,10 @@ stdenv.mkDerivation {
8585 moveToOutput "bin/*-config" "$dev"
8686 moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
8787 for file in "$dev"/bin/*-config; do
88− substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \
89− ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config
90− substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \
91− "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'"
88+ substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \
89+ ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
90+ substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \
91+ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
9292 done
9393 '' + lib.optionalString (ghostscript != null) ''
9494 for la in $out/lib/*.la; do
pkgs/applications/graphics/ahoviewer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, fetchFromGitHub, pkgconfig, libconfig
1+{ config, lib, stdenv, fetchFromGitHub, pkg-config, libconfig
22, gtkmm2, glibmm, libxml2, libsecret, curl, libzip
33, librsvg, gst_all_1, autoreconfHook, makeWrapper
44, useUnrar ? config.ahoviewer.useUnrar or false, unrar
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 enableParallelBuilding = true;
2121
22− nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
22+ nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
2323 buildInputs = [
2424 glibmm libconfig gtkmm2 glibmm libxml2
2525 libsecret curl libzip librsvg
pkgs/applications/graphics/akira/default.nix+2−2
@@ -6,7 +6,7 @@
66, meson
77, ninja
88, pantheon
9−, pkgconfig
9+, pkg-config
1010, python3
1111, vala
1212, vala-lint
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 desktop-file-utils
3838 meson
3939 ninja
40− pkgconfig
40+ pkg-config
4141 python3
4242 vala
4343 vala-lint
pkgs/applications/graphics/autotrace/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, callPackage, libpng12, imagemagick
2−, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin
2+, autoreconfHook, glib, pstoedit, pkg-config, gettext, gd, darwin
33, runtimeShell }:
44
55# TODO: Figure out why the resultant binary is somehow linked against
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 #'';
3535
3636 autofig = callPackage ./autofig.nix {};
37− nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ];
37+ nativeBuildInputs = [ autoreconfHook glib autofig pkg-config gettext ];
3838 buildInputs = [ libpng12 imagemagick pstoedit ]
3939 ++ lib.optionals stdenv.isDarwin
4040 (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]);
pkgs/applications/graphics/darktable/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook
22, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
33, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
4−, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt
4+, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt
55, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
66, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages
77}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda";
1616 };
1717
18− nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
18+ nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
1919
2020 buildInputs = [
2121 cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif
pkgs/applications/graphics/dia/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages,
1+{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages,
22libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
33libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
44gtk-mac-integration-gtk2 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 ++ lib.optional withGNOME libgnomeui
2020 ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
2121
22− nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]
22+ nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ]
2323 ++ (with perlPackages; [ perl XMLParser ]);
2424
2525 preConfigure = ''
pkgs/applications/graphics/displaycal/default.nix+2−2
@@ -1,7 +1,7 @@
11{ python2
22, lib, stdenv
33, fetchurl
4−, pkgconfig
4+, pkg-config
55, libXext
66, libXxf86vm
77, libX11
@@ -38,7 +38,7 @@ in buildPythonApplication rec {
3838 ];
3939
4040 nativeBuildInputs = [
41− pkgconfig
41+ pkg-config
4242 ];
4343
4444 preConfigure = ''
pkgs/applications/graphics/djview/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, mkDerivation
33, fetchurl
4−, pkgconfig
4+, pkg-config
55, djvulibre
66, qtbase
77, qttools
@@ -20,7 +20,7 @@ mkDerivation rec {
2020 };
2121
2222 nativeBuildInputs = [
23− pkgconfig
23+ pkg-config
2424 qttools
2525 ];
2626
pkgs/applications/graphics/drawing/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, python3
77, gtk3
88, appstream-glib
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
3434 gobject-introspection
3535 meson
3636 ninja
37− pkgconfig
37+ pkg-config
3838 wrapGAppsHook
3939 glib
4040 gettext
pkgs/applications/graphics/epeg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
1+{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, autoconf, automake
22, libjpeg, libexif
33}:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 enableParallelBuilding = true;
1717
18− nativeBuildInputs = [ pkgconfig libtool autoconf automake ];
18+ nativeBuildInputs = [ pkg-config libtool autoconf automake ];
1919
2020 propagatedBuildInputs = [ libjpeg libexif ];
2121
pkgs/applications/graphics/exrdisplay/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }:
1+{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }:
22
33stdenv.mkDerivation {
44 name ="openexr_viewers-2.2.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ openexr fltk libGLU libGL ctl ];
2121
2222 meta = {
pkgs/applications/graphics/exrtools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }:
1+{ lib, stdenv, fetchurl, pkg-config, openexr, libpng12, libjpeg }:
22
33stdenv.mkDerivation rec {
44 pname = "exrtools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ stdenv openexr libpng12 libjpeg ];
1414
1515 meta = with lib; {
pkgs/applications/graphics/fbida/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm
2−, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
2+, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
33, epoxy, poppler, mesa, lirc }:
44
55stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig which ];
13+ nativeBuildInputs = [ pkg-config which ];
1414 buildInputs = [
1515 libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
1616 imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc
pkgs/applications/graphics/fondo/default.nix+2−2
@@ -3,7 +3,7 @@
33, nix-update-script
44, pantheon
55, vala
6−, pkgconfig
6+, pkg-config
77, meson
88, ninja
99, python3
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 desktop-file-utils
3535 meson
3636 ninja
37− pkgconfig
37+ pkg-config
3838 python3
3939 vala
4040 wrapGAppsHook
pkgs/applications/graphics/freecad/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
22xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
33opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
4−gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }:
4+gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }:
55
66assert mpi != null;
77
@@ -21,7 +21,7 @@ in mkDerivation rec {
2121 nativeBuildInputs = [
2222 cmake
2323 ninja
24− pkgconfig
24+ pkg-config
2525 pythonPackages.pyside2-tools
2626 wrapQtAppsHook
2727 ];
pkgs/applications/graphics/gcolor2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchurl, gtk2, perlPackages, pkgconfig } :
1+{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } :
22
33let version = "0.4"; in
44stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 [ ./gcolor2-amd64.patch ] else
2121 [ ];
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424 buildInputs = [ gtk2 ]
2525 ++ (with perlPackages; [ perl XMLParser ]);
2626
pkgs/applications/graphics/geeqie/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
1+{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext, intltool
22, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
33, wrapGAppsHook, fetchpatch
44}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 preConfigure = "./autogen.sh";
2525
26− nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool
26+ nativeBuildInputs = [ pkg-config autoconf automake gettext intltool
2727 wrapGAppsHook
2828 ];
2929
pkgs/applications/graphics/gimp/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchurl
44, substituteAll
55, autoreconfHook
6−, pkgconfig
6+, pkg-config
77, intltool
88, babl
99, gegl
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
7676
7777 nativeBuildInputs = [
7878 autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am
79− pkgconfig
79+ pkg-config
8080 intltool
8181 gettext
8282 makeWrapper
pkgs/applications/graphics/glabels/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook
22, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
3−, intltool, itstool, makeWrapper, pkgconfig, yelp-tools
3+, intltool, itstool, makeWrapper, pkg-config, yelp-tools
44}:
55
66stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
1616 buildInputs = [
1717 barcode gtk3 gtk-doc yelp-tools
1818 gnome3.gnome-common gsettings-desktop-schemas
pkgs/applications/graphics/gnome-photos/default.nix+2−2
@@ -27,7 +27,7 @@
2727, meson
2828, ninja
2929, nixosTests
30−, pkgconfig
30+, pkg-config
3131, python3
3232, tracker
3333, tracker-miners
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
7373 libxml2
7474 meson
7575 ninja
76− pkgconfig
76+ pkg-config
7777 (python3.withPackages (pkgs: with pkgs; [
7878 dogtail
7979 pygobject3
pkgs/applications/graphics/gnuclad/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig
1+{ stdenv, lib, fetchurl, pkg-config
22}:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 meta = with lib; {
1818 homepage = "https://launchpad.net/gnuclad";
pkgs/applications/graphics/goxel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
1+{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook
22, glfw3, gtk3, libpng12 }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 patches = [ ./disable-imgui_ini.patch ];
1616
17− nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
17+ nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
1818 buildInputs = [ glfw3 gtk3 libpng12 ];
1919 NIX_LDFLAGS = "-lpthread";
2020
pkgs/applications/graphics/gpicview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }:
1+{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }:
22
33stdenv.mkDerivation {
44 name = "gpicview-0.2.4";
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
2424 platforms = platforms.unix;
2525 };
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828 buildInputs = [ intltool gtk2 ];
2929}
pkgs/applications/graphics/gqview/default.nix+3−3
@@ -1,6 +1,6 @@
1−{lib, stdenv, fetchurl, pkgconfig, gtk2, libpng}:
1+{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}:
22
3−assert pkgconfig != null && gtk2 != null && libpng != null;
3+assert pkg-config != null && gtk2 != null && libpng != null;
44# Note that we cannot just copy gtk's png attribute, since gtk might
55# not be linked against png.
66# !!! assert libpng == gtk2.libpng;
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ gtk2 libpng];
1818
1919 hardeningDisable = [ "format" ];
pkgs/applications/graphics/grafx2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }:
1+{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkg-config, lua5 }:
22
33stdenv.mkDerivation rec {
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ];
1515
1616 preBuild = "cd src";
pkgs/applications/graphics/gthumb/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, fetchpatch
44, gnome3
5−, pkgconfig
5+, pkg-config
66, meson
77, ninja
88, exiv2
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 itstool
4848 meson
4949 ninja
50− pkgconfig
50+ pkg-config
5151 python3
5252 wrapGAppsHook
5353 ];
pkgs/applications/graphics/guetzli/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, libpng, fetchFromGitHub, pkgconfig }:
1+{ lib, stdenv, libpng, fetchFromGitHub, pkg-config }:
22let
33 version = "1.0.1";
44in
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 rev = "v${version}";
1212 sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm";
1313 };
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libpng ];
1616
1717 installPhase = ''
pkgs/applications/graphics/hugin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch
1+{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch
22, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
33, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
44, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 wxGTK zlib
2727 ];
2828
29− nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
29+ nativeBuildInputs = [ cmake makeWrapper pkg-config ];
3030
3131 # disable installation of the python scripting interface
3232 cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
pkgs/applications/graphics/ideogram/default.nix+2−2
@@ -3,7 +3,7 @@
33, nix-update-script
44, fetchpatch
55, vala
6−, pkgconfig
6+, pkg-config
77, python3
88, glib
99, gtk3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 meson
3333 ninja
3434 vala
35− pkgconfig
35+ pkg-config
3636 python3
3737 wrapGAppsHook
3838 ];
pkgs/applications/graphics/imv/default.nix+2−2
@@ -8,7 +8,7 @@
88, fontconfig
99, meson
1010, ninja
11−, pkgconfig
11+, pkg-config
1212, icu
1313, pango
1414, inih
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
7979 libxslt
8080 meson
8181 ninja
82− pkgconfig
82+ pkg-config
8383 ];
8484
8585 buildInputs = [
pkgs/applications/graphics/ipe/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
1+{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript
22, libjpeg, libpng, qtbase, mkDerivation
33}:
44
@@ -20,7 +20,7 @@ mkDerivation rec {
2020 libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
2121 ];
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424
2525 qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ];
2626
pkgs/applications/graphics/k3d/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
22, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
3−, libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff
3+, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff
44, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
55
66stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
3030 '';
3131
32− nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ];
32+ nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ];
3333
3434 buildInputs = [
3535 libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng
pkgs/applications/graphics/kgraphviewer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
1+{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook
22, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons
33, qtbase, qtsvg
44, boost, graphviz
@@ -19,7 +19,7 @@ mkDerivation rec {
1919 ];
2020
2121 nativeBuildInputs = [
22− cmake extra-cmake-modules pkgconfig wrapGAppsHook
22+ cmake extra-cmake-modules pkg-config wrapGAppsHook
2323 kdoctools
2424 ];
2525
pkgs/applications/graphics/ktikz/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch
2−, pkgconfig, wrapQtAppsHook
2+, pkg-config, wrapQtAppsHook
33, poppler, gnuplot
44, qmake, qtbase, qttools
55}:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 })
4444 ];
4545
46− nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ];
46+ nativeBuildInputs = [ pkg-config qttools qmake wrapQtAppsHook ];
4747 QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
4848
4949 buildInputs = [ qtbase poppler ];
pkgs/applications/graphics/luminance-hdr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig
1+{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config
22, boost, exiv2, fftwFloat, gsl
33, ilmbase, lcms2, libraw, libtiff, openexr
44, qtbase, qtdeclarative, qttools, qtwebengine, eigen
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
2323 ];
2424
25− nativeBuildInputs = [ cmake pkgconfig ];
25+ nativeBuildInputs = [ cmake pkg-config ];
2626
2727 meta = with lib; {
2828 homepage = "http://qtpfsgui.sourceforge.net/";
pkgs/applications/graphics/mozjpeg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libpng, nasm }:
22
33stdenv.mkDerivation rec {
44 version = "3.3.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ libpng nasm ];
1616
1717 meta = {
pkgs/applications/graphics/mypaint/default.nix+2−2
@@ -11,7 +11,7 @@
1111, hicolor-icon-theme
1212, mypaint-brushes
1313, gdk-pixbuf
14−, pkgconfig
14+, pkg-config
1515, python3
1616, swig
1717, wrapGAppsHook
@@ -33,7 +33,7 @@ in buildPythonApplication rec {
3333
3434 nativeBuildInputs = [
3535 gettext
36− pkgconfig
36+ pkg-config
3737 swig
3838 wrapGAppsHook
3939 gobject-introspection # for setup hook
pkgs/applications/graphics/nomacs/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, fetchpatch
55, cmake
6−, pkgconfig
6+, pkg-config
77
88, qtbase
99, qttools
@@ -32,7 +32,7 @@ mkDerivation rec {
3232 '';
3333
3434 nativeBuildInputs = [cmake
35− pkgconfig];
35+ pkg-config];
3636
3737 buildInputs = [qtbase
3838 qttools
pkgs/applications/graphics/openimageio/2.x.nix+1−1
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
5353 "-DUSE_PYTHON=OFF"
5454 "-DUSE_QT=OFF"
5555 # GNUInstallDirs
56− "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig
56+ "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
5757 ];
5858
5959 meta = with lib; {
pkgs/applications/graphics/openscad/default.nix+2−2
@@ -14,7 +14,7 @@
1414, mpfr
1515, gmp
1616, glib
17−, pkgconfig
17+, pkg-config
1818, harfbuzz
1919, gettext
2020, freetype
@@ -38,7 +38,7 @@ mkDerivation rec {
3838 sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l";
3939 };
4040
41− nativeBuildInputs = [ bison flex pkgconfig gettext qmake ];
41+ nativeBuildInputs = [ bison flex pkg-config gettext qmake ];
4242
4343 buildInputs = [
4444 eigen boost glew opencsg cgal mpfr gmp glib
pkgs/applications/graphics/opentoonz/default.nix+2−2
@@ -1,5 +1,5 @@
11{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint
2−, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase
2+, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase
33, qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }:
44let source = import ./source.nix { inherit fetchFromGitHub; };
55in stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
88 pname = "opentoonz";
99 version = source.versions.opentoonz;
1010
11− nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
11+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
1212
1313 buildInputs = [
1414 boost
pkgs/applications/graphics/photivo/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16,
2− lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
2+ lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }:
33
44stdenv.mkDerivation {
55 name = "photivo-2014-01-25";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
2828 sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp
2929 '';
3030
31− nativeBuildInputs = [ cmake pkgconfig ];
31+ nativeBuildInputs = [ cmake pkg-config ];
3232
3333 buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
3434
pkgs/applications/graphics/photoflow/default.nix+2−2
@@ -20,7 +20,7 @@
2020, ninja
2121, openexr
2222, pcre
23−, pkgconfig
23+, pkg-config
2424, pugixml
2525, lib, stdenv
2626, swig
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 gobject-introspection
4949 libxml2
5050 ninja
51− pkgconfig
51+ pkg-config
5252 swig
5353 ];
5454
pkgs/applications/graphics/pqiv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, pkg-config
22, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
1313 sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ];
1818
1919 prePatch = "patchShebangs .";
pkgs/applications/graphics/qcomicbook/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
1+{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }:
22
33mkDerivation rec {
44 pname = "qcomicbook";
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [
15− cmake pkgconfig
15+ cmake pkg-config
1616 ];
1717
1818 buildInputs = [
pkgs/applications/graphics/qimgv/default.nix+2−2
@@ -4,7 +4,7 @@
44, fetchpatch
55
66, cmake
7−, pkgconfig
7+, pkg-config
88
99, exiv2
1010, mpv
@@ -27,7 +27,7 @@ mkDerivation rec {
2727
2828 nativeBuildInputs = [
2929 cmake
30− pkgconfig
30+ pkg-config
3131 ];
3232
3333 buildInputs = [
pkgs/applications/graphics/qiv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } :
1+{ lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } :
22
33stdenv.mkDerivation (rec {
44 version = "2.3.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation (rec {
99 sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ gtk2 imlib2 file lcms2 libexif ];
1414
1515 preBuild=''
pkgs/applications/graphics/rawtherapee/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau
22, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
33, lensfun, librsvg
44}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik";
1515 };
1616
17− nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
17+ nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
1818
1919 buildInputs = [
2020 pixman libpthreadstubs gtkmm3 libXau libXdmcp
pkgs/applications/graphics/renderdoc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mkDerivation
22, qtbase, qtx11extras, qtsvg, makeWrapper
33, vulkan-loader, libglvnd, xorg, python3, python3Packages
44, bison, pcre, automake, autoconf, addOpenGLRunpath
@@ -28,7 +28,7 @@ mkDerivation rec {
2828 ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
2929 # TODO: figure out how to make cmake recognise pyside2
3030
31− nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ];
31+ nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
3232
3333 postUnpack = ''
3434 cp -r ${custom_swig} swig
pkgs/applications/graphics/sane/backends/generic.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv
2−, gettext, pkgconfig
2+, gettext, pkg-config
33, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
44
55# List of { src name backend } attibute sets - see installFirmware below:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
2121
2222 nativeBuildInputs = [
2323 gettext
24− pkgconfig
24+ pkg-config
2525 ];
2626
2727 buildInputs = [
pkgs/applications/graphics/sane/frontends.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }:
1+{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkg-config, libusb-compat-0_1 ? null }:
22
33stdenv.mkDerivation rec {
44 pname = "sane-frontends";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [ sane-backends libX11 gtk2 ]
1717 ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919
2020 enableParallelBuilding = true;
2121
pkgs/applications/graphics/sane/xsane.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng
1+{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng
22, libusb-compat-0_1 ? null
33, gimpSupport ? false, gimp ? null
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 chmod a+rX -R .
1919 '';
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
2323 ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else [])
2424 ++ lib.optional gimpSupport gimp;
pkgs/applications/graphics/shotwell/default.nix+2−2
@@ -11,7 +11,7 @@
1111, vala
1212, sqlite
1313, webkitgtk
14−, pkgconfig
14+, pkg-config
1515, gnome3
1616, gst_all_1
1717, libgudev
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 meson
5252 ninja
5353 vala
54− pkgconfig
54+ pkg-config
5555 itstool
5656 gettext
5757 desktop-file-utils
pkgs/applications/graphics/solvespace/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
1+{ lib, stdenv, fetchgit, cmake, pkg-config, zlib, libpng, cairo, freetype
22, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre
33, wrapGAppsHook
44}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [
16− pkgconfig cmake wrapGAppsHook
16+ pkg-config cmake wrapGAppsHook
1717 ];
1818 buildInputs = [
1919 zlib libpng cairo freetype
pkgs/applications/graphics/synfigstudio/default.nix+3−3
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
2−, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
2+, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config
33, imagemagick, intltool, autoreconfHook, which, gnome3
44}:
55
@@ -39,7 +39,7 @@ let
3939 "--with-boost-libdir=${boost.out}/lib"
4040 ];
4141
42− nativeBuildInputs = [ pkgconfig autoreconfHook gettext ];
42+ nativeBuildInputs = [ pkg-config autoreconfHook gettext ];
4343 buildInputs = [
4444 ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango
4545 ];
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
103103
104104 preConfigure = "./bootstrap.sh";
105105
106− nativeBuildInputs = [ pkgconfig autoreconfHook gettext ];
106+ nativeBuildInputs = [ pkg-config autoreconfHook gettext ];
107107 buildInputs = [
108108 ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
109109 libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
pkgs/applications/graphics/tesseract/tesseract3.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
22, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 enableParallelBuilding = true;
1616
17− nativeBuildInputs = [ pkgconfig autoreconfHook ];
17+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1818 buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
1919
2020 LIBLEPT_HEADERSDIR = "${leptonica}/include";
pkgs/applications/graphics/tesseract/tesseract4.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config
22, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 enableParallelBuilding = true;
1616
17− nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ];
17+ nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
1818 buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
1919
2020 meta = {
pkgs/applications/graphics/viewnior/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms
22, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
33
44stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [
1616 meson
1717 ninja
18− pkgconfig
18+ pkg-config
1919 desktop-file-utils
2020 intltool
2121 gettext
pkgs/applications/graphics/xournal/default.nix+2−2
@@ -2,7 +2,7 @@
22, ghostscript, atk, gtk2, glib, fontconfig, freetype
33, libgnomecanvas, libgnomeprint, libgnomeprintui
44, pango, libX11, xorgproto, zlib, poppler
5−, autoconf, automake, libtool, pkgconfig}:
5+, autoconf, automake, libtool, pkg-config}:
66
77let
88 isGdkQuartzBackend = (gtk2.gdktarget == "quartz");
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 libgnomeprint libgnomeprintui
2525 ];
2626
27− nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
27+ nativeBuildInputs = [ autoconf automake libtool pkg-config ];
2828
2929 NIX_LDFLAGS = "-lz"
3030 + lib.optionalString (!isGdkQuartzBackend) " -lX11";
pkgs/applications/graphics/xzgv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
1+{ lib, stdenv, fetchurl, gtk2, libexif, pkg-config, texinfo }:
22
33stdenv.mkDerivation rec {
44 pname = "xzgv";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
77 url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
88 sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
99 };
10− nativeBuildInputs = [ pkgconfig texinfo ];
10+ nativeBuildInputs = [ pkg-config texinfo ];
1111 buildInputs = [ gtk2 libexif ];
1212 postPatch = ''
1313 substituteInPlace config.mk \
pkgs/applications/graphics/yacreader/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkgconfig, libunarr
1+{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkg-config, libunarr
22, libGLU, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols
33, qtscript
44}:
@@ -14,7 +14,7 @@ mkDerivation rec {
1414 sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv";
1515 };
1616
17− nativeBuildInputs = [ qmake pkgconfig ];
17+ nativeBuildInputs = [ qmake pkg-config ];
1818 buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ];
1919 propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ];
2020
pkgs/applications/graphics/zgv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }:
1+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, SDL, SDL_image, libjpeg, libpng, libtiff }:
22
33stdenv.mkDerivation rec {
44 pname = "zgv";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ SDL SDL_image libjpeg libpng libtiff ];
1313
1414 hardeningDisable = [ "format" ];
pkgs/applications/networking/browsers/asuka/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }:
1+{ lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "asuka";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111
1212 cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw";
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ ncurses openssl ]
1717 ++ lib.optional stdenv.isDarwin Security;
pkgs/applications/networking/browsers/chromium/common.nix+2−2
@@ -7,7 +7,7 @@
77, xdg_utils, yasm, nasm, minizip, libwebp
88, libusb1, pciutils, nss, re2
99
10−, python2Packages, perl, pkgconfig
10+, python2Packages, perl, pkg-config
1111, nspr, systemd, kerberos
1212, util-linux, alsaLib
1313, bison, gperf
@@ -126,7 +126,7 @@ let
126126
127127 nativeBuildInputs = [
128128 llvmPackages.lldClang.bintools
129− ninja which python2Packages.python perl pkgconfig
129+ ninja which python2Packages.python perl pkg-config
130130 python2Packages.ply python2Packages.jinja2 nodejs
131131 gnutar python2Packages.setuptools
132132 ];
pkgs/applications/networking/browsers/elinks/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib
2−, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev
2+, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev
33, gpm, libidn, tre, expat
44, # Incompatible licenses, LGPLv3 - GPLv2
55 enableGuile ? false, guile ? null
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 ++ lib.optional enablePerl perl
3333 ;
3434
35− nativeBuildInputs = [ autoreconfHook gettext pkgconfig ];
35+ nativeBuildInputs = [ autoreconfHook gettext pkg-config ];
3636
3737 configureFlags = [
3838 "--enable-finger"
pkgs/applications/networking/browsers/eolie/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script
1+{ lib, stdenv, fetchgit, meson, ninja, pkg-config, nix-update-script
22, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
33, glib-networking, gtkspell3, hunspell, desktop-file-utils
44, gobject-introspection, wrapGAppsHook, gnome3 }:
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
2222 gobject-introspection
2323 meson
2424 ninja
25− pkgconfig
25+ pkg-config
2626 wrapGAppsHook
2727 ];
2828
pkgs/applications/networking/browsers/ephemeral/default.nix+2−2
@@ -11,7 +11,7 @@
1111, meson
1212, ninja
1313, pantheon
14−, pkgconfig
14+, pkg-config
1515, python3
1616, webkitgtk
1717, wrapGAppsHook
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 meson
3636 ninja
3737 vala
38− pkgconfig
38+ pkg-config
3939 python3
4040 wrapGAppsHook
4141 ];
pkgs/applications/networking/browsers/falkon/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch
2−, cmake, extra-cmake-modules, pkgconfig, qmake
2+, cmake, extra-cmake-modules, pkg-config, qmake
33, libpthreadstubs, libxcb, libXdmcp
44, qtsvg, qttools, qtwebengine, qtx11extras
55, qtwayland, wrapQtAppsHook
@@ -41,7 +41,7 @@ mkDerivation rec {
4141 nativeBuildInputs = [
4242 cmake
4343 extra-cmake-modules
44− pkgconfig
44+ pkg-config
4545 qmake
4646 qttools
4747 wrapQtAppsHook
pkgs/applications/networking/browsers/links2/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl
2−, gpm, openssl, pkgconfig, libev # Misc.
2+, gpm, openssl, pkg-config, libev # Misc.
33, libpng, libjpeg, libtiff, librsvg # graphic formats
44, bzip2, zlib, xz # Transfer encodings
55, enableFB ? true
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 ++ optionals enableX11 [ libX11 libXau libXt ]
2323 ++ optional enableDirectFB [ directfb ];
2424
25− nativeBuildInputs = [ pkgconfig bzip2 ];
25+ nativeBuildInputs = [ pkg-config bzip2 ];
2626
2727 configureFlags = [ "--with-ssl" ]
2828 ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"
pkgs/applications/networking/browsers/midori/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, cmake
44, ninja
5−, pkgconfig
5+, pkg-config
66, intltool
77, vala
88, wrapGAppsHook
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 cmake
3232 intltool
3333 ninja
34− pkgconfig
34+ pkg-config
3535 vala
3636 wrapGAppsHook
3737 ];
pkgs/applications/networking/browsers/netsurf/browser.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
22
33# Buildtime dependencies.
4−, check, pkgconfig, xxd
4+, check, pkg-config, xxd
55
66# Runtime dependencies.
77, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 makeWrapper
3838 perl
3939 perlPackages.HTMLParser
40− pkgconfig
40+ pkg-config
4141 xxd
4242 ]
4343 ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook
pkgs/applications/networking/browsers/netsurf/libcss.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, perl
1+{ lib, stdenv, fetchurl, pkg-config, perl
22, buildsystem
33, libparserutils
44, libwapcaplet
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [
1919 perl
2020 libparserutils
pkgs/applications/networking/browsers/netsurf/libdom.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, expat
1+{ lib, stdenv, fetchurl, pkg-config, expat
22, buildsystem
33, libparserutils
44, libwapcaplet
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [
2020 expat
2121 libhubbub
pkgs/applications/networking/browsers/netsurf/libhubbub.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, perl
1+{ lib, stdenv, fetchurl, pkg-config, perl
22, buildsystem
33, libparserutils
44}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [
1818 perl
1919 libparserutils
pkgs/applications/networking/browsers/netsurf/libnsbmp.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, buildsystem
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ buildsystem ];
1717
1818 makeFlags = [
pkgs/applications/networking/browsers/netsurf/libnsfb.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, uilib, SDL
33, buildsystem
44}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ SDL buildsystem ];
1818
1919 makeFlags = [
pkgs/applications/networking/browsers/netsurf/libnsgif.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, buildsystem
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ buildsystem ];
1717
1818 makeFlags = [
pkgs/applications/networking/browsers/netsurf/libnslog.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, bison, flex
1+{ lib, stdenv, fetchurl, pkg-config, bison, flex
22, buildsystem
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig bison flex ];
15+ nativeBuildInputs = [ pkg-config bison flex ];
1616 buildInputs = [ buildsystem ];
1717
1818 makeFlags = [
pkgs/applications/networking/browsers/netsurf/libnspsl.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, buildsystem
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ buildsystem ];
1717
1818 makeFlags = [
pkgs/applications/networking/browsers/netsurf/libnsutils.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, buildsystem
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ buildsystem ];
1717
1818 makeFlags = [
pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, gperf
1+{ lib, stdenv, fetchurl, pkg-config, gperf
22, buildsystem
33, libdom
44, libhubbub
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig gperf ];
19+ nativeBuildInputs = [ pkg-config gperf ];
2020 buildInputs = [
2121 libdom
2222 libhubbub
pkgs/applications/networking/browsers/netsurf/libutf8proc.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, buildsystem
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ buildsystem ];
1717
1818 makeFlags = [
pkgs/applications/networking/browsers/surf/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchgit
2−, pkgconfig, wrapGAppsHook
2+, pkg-config, wrapGAppsHook
33, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
44, xorg, dmenu, findutils, gnused, coreutils
55, patches ? null
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
18+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
1919 buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];
2020
2121 inherit patches;
pkgs/applications/networking/browsers/vimb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking
1+{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking
22, gsettings-desktop-schemas, wrapGAppsHook
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf";
1414 };
1515
16− nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
16+ nativeBuildInputs = [ wrapGAppsHook pkg-config ];
1717 buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ];
1818
1919 makeFlags = [ "PREFIX=${placeholder "out"}" ];
pkgs/applications/networking/browsers/webbrowser/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper
1+{ stdenv, lib, fetchgit, makeDesktopItem, pkg-config, makeWrapper
22# Build
33, python2, autoconf213, yasm, perl
44, unzip, gnome2, gnum4
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
4141 };
4242
4343 nativeBuildInputs = [
44− gnum4 makeWrapper perl pkgconfig python2
44+ gnum4 makeWrapper perl pkg-config python2
4545 ];
4646
4747 buildInputs = [
pkgs/applications/networking/compactor/default.nix+2−2
@@ -1,5 +1,5 @@
11{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb
2−, libpcap, libtins, libtool, lzma, openssl, pkgconfig, lib, stdenv, tcpdump, wireshark-cli
2+, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli
33}:
44
55stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 # cbor-diag, cddl and wireshark-cli are only used for tests.
17− nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ];
17+ nativeBuildInputs = [ autoconf automake libtool pkg-config cbor-diag cddl wireshark-cli ];
1818 buildInputs = [
1919 boost
2020 libpcap
pkgs/applications/networking/dropbox/cli.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, substituteAll
3−, pkgconfig
3+, pkg-config
44, fetchurl
55, python3
66, dropbox
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
3535 ];
3636
3737 nativeBuildInputs = [
38− pkgconfig
38+ pkg-config
3939 gobject-introspection
4040 gdk-pixbuf
4141 # only for build, the install command also wants to use GTK through introspection
pkgs/applications/networking/linssid/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
1+{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "linssid";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook ];
12+ nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
1313 buildInputs = [ qtbase qtsvg boost qwt ];
1414
1515 patches = [ ./0001-unbundled-qwt.patch ];
pkgs/applications/networking/mpop/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }:
1+{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }:
22
33with lib;
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ gnutls gsasl libidn ]
1616 ++ optional stdenv.isDarwin Security;
1717
pkgs/applications/networking/msmtp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo
1+{ stdenv, lib, fetchurl, autoreconfHook, pkg-config, texinfo
22, netcat-gnu, gnutls, gsasl, libidn2, Security
33, withKeyring ? true, libsecret ? null
44, systemd ? null }:
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
2424 ++ lib.optional stdenv.isDarwin Security
2525 ++ lib.optional withKeyring libsecret;
2626
27− nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ];
27+ nativeBuildInputs = [ autoreconfHook pkg-config texinfo ];
2828
2929 configureFlags =
3030 [ "--sysconfdir=/etc" ] ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
pkgs/applications/networking/mumble/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5
1+{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5
22, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
33, alsaLib, python
44, rnnoise
@@ -25,7 +25,7 @@ let
2525 patches = (source.patches or [])
2626 ++ [ ./fix-rnnoise-argument.patch ];
2727
28− nativeBuildInputs = [ pkgconfig python qt5.qmake ]
28+ nativeBuildInputs = [ pkg-config python qt5.qmake ]
2929 ++ (overrides.nativeBuildInputs or [ ]);
3030
3131 buildInputs = [ boost protobuf avahi ]
pkgs/applications/networking/newsreaders/pan/default.nix+2−2
@@ -1,5 +1,5 @@
11{ spellChecking ? true
2−, lib, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
2+, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null
33, gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls
44, makeWrapper, gnupg
55, gnomeSupport ? true, libsecret, gcr
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
1919 };
2020
21− nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
21+ nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ];
2222 buildInputs = [ gtk3 gmime2 libnotify gnutls ]
2323 ++ lib.optional spellChecking gtkspell3
2424 ++ lib.optionals gnomeSupport [ libsecret gcr ];
pkgs/applications/networking/nym/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, rustPlatform
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, openssl
66, libredirect
77, writeText
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
2929
3030 cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272";
3131
32− nativeBuildInputs = [ pkgconfig ];
32+ nativeBuildInputs = [ pkg-config ];
3333
3434 buildInputs = [ openssl ];
3535
pkgs/applications/networking/owncloud-client/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }:
1+{ lib, stdenv, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }:
22
33mkDerivation rec {
44 pname = "owncloud-client";
@@ -9,7 +9,7 @@ mkDerivation rec {
99 sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig cmake ];
12+ nativeBuildInputs = [ pkg-config cmake ];
1313 buildInputs = [ qtbase qtkeychain sqlite ];
1414
1515 qtWrapperArgs = [
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11
22, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]
1717 ++ lib.optional stdenv.isDarwin libiconv;
1818
pkgs/applications/networking/p2p/gnunet/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
22, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
3−, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib
3+, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib
44, libpulseaudio, libopus, libogg, jansson, libsodium }:
55
66stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 enableParallelBuilding = true;
1616
17− nativeBuildInputs = [ pkgconfig libtool makeWrapper ];
17+ nativeBuildInputs = [ pkg-config libtool makeWrapper ];
1818 buildInputs = [
1919 adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
2020 libmicrohttpd libunistring libxml2 ncurses gettext libsodium
pkgs/applications/networking/p2p/ncdc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
1+{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }:
22
33stdenv.mkDerivation rec {
44 pname = "ncdc";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ];
1414
1515 meta = with lib; {
pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
1+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config
22, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
33, debugSupport ? false
44, guiSupport ? true, dbus ? null # GUI (disable to run headless)
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 };
2323
2424 # NOTE: 2018-05-31: CMake is working but it is not officially supported
25− nativeBuildInputs = [ makeWrapper pkgconfig ];
25+ nativeBuildInputs = [ makeWrapper pkg-config ];
2626
2727 buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
2828 ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support
pkgs/applications/networking/p2p/retroshare/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
1+{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2
22, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3
33, qtmultimedia, qtx11extras, qttools }:
44
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 libretroshare/src/upnp/UPnPBase.cpp
2222 '';
2323
24− nativeBuildInputs = [ pkgconfig qmake ];
24+ nativeBuildInputs = [ pkg-config qmake ];
2525 buildInputs = [
2626 speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools
2727 protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3
pkgs/applications/networking/p2p/synapse-bt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }:
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, Security }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "synapse-bt";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ openssl ]
1818 ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
1919
pkgs/applications/networking/p2p/torrential/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, nix-update-script
44, cmake
5−, pkgconfig
5+, pkg-config
66, vala_0_40
77, pantheon
88, curl
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 nativeBuildInputs = [
3434 cmake
3535 vala_0_40 # https://github.com/davidmhewitt/torrential/issues/135
36− pkgconfig
36+ pkg-config
3737 wrapGAppsHook
3838 ];
3939
pkgs/applications/networking/p2p/transgui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
1+{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus,
22libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [
1717 unzip fpc lazarus stdenv.cc
1818 libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
1+{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkg-config
22, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }:
33
44
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 nativeBuildInputs= [
2626 autoconf automake libtool wrapGAppsHook
27− pkgconfig intltool autoconf-archive
27+ pkg-config intltool autoconf-archive
2828 appstream-glib
2929 ];
3030
pkgs/applications/networking/p2p/transmission/default.nix+2−2
@@ -2,7 +2,7 @@
22, lib
33, fetchFromGitHub
44, cmake
5−, pkgconfig
5+, pkg-config
66, openssl
77, curl
88, libevent
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
5050 ];
5151
5252 nativeBuildInputs = [
53− pkgconfig
53+ pkg-config
5454 cmake
5555 ]
5656 ++ lib.optionals enableGTK3 [ wrapGAppsHook ]
pkgs/applications/networking/p2p/twister/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2
22, boost, db, openssl, geoip, libiconv, miniupnpc
33, srcOnly, fetchgit
44}:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
3535 "--with-boost-libdir=${boostPython.out}/lib"
3636 ];
3737
38− nativeBuildInputs = [ pkgconfig ];
38+ nativeBuildInputs = [ pkg-config ];
3939 buildInputs = [
4040 autoconf automake libtool python2
4141 boostPython db openssl geoip miniupnpc libiconv
pkgs/applications/networking/remote/freerdp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl
22, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
33, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
44, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
8282 zlib
8383 ] ++ optional stdenv.isLinux systemd;
8484
85− nativeBuildInputs = [ cmake pkgconfig ];
85+ nativeBuildInputs = [ cmake pkg-config ];
8686
8787 doCheck = true;
8888
pkgs/applications/networking/remote/putty/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
1+{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool
22, gtk2, halibut, ncurses, perl, darwin
33}:
44
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 done
3636 '' else null;
3737
38− nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
38+ nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ];
3939 buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
4040 gtk2 ncurses
4141 ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
pkgs/applications/networking/remote/rdesktop/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook
1+{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook
22, enableCredssp ? (!stdenv.isDarwin)
33} :
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
1313 sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78";
1414 };
1515
16− nativeBuildInputs = [pkgconfig autoreconfHook];
16+ nativeBuildInputs = [pkg-config autoreconfHook];
1717 buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls]
1818 ++ lib.optional enableCredssp krb5;
1919
pkgs/applications/networking/remote/remmina/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
1+{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook
22, glib, gtk3, gettext, libxkbfile, libX11
33, freerdp, libssh, libgcrypt, gnutls
44, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw=";
2323 };
2424
25− nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
25+ nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
2626 buildInputs = [
2727 gsettings-desktop-schemas
2828 glib gtk3 gettext libxkbfile libX11
pkgs/applications/networking/remote/x2goclient/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
2−, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
2+, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
33
44mkDerivation {
55 pname = "x2goclient";
@@ -12,7 +12,7 @@ mkDerivation {
1212 };
1313
1414 buildInputs = [ cups libssh libXpm nx-libs openldap openssh
15− qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
15+ qtbase qtsvg qtx11extras qttools phonon pkg-config ];
1616
1717 postPatch = ''
1818 substituteInPlace Makefile \
pkgs/applications/networking/remote/xrdp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
22
33let
44 xorgxrdp = stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ let
1212 sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
15+ nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ];
1616
1717 buildInputs = [ xorg.xorgserver ];
1818
@@ -45,7 +45,7 @@ let
4545 sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z";
4646 };
4747
48− nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
48+ nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ];
4949
5050 buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ];
5151
pkgs/applications/networking/sniffers/etherape/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2,
1+{ lib, stdenv, fetchurl, pkg-config, libtool, gtk3, libpcap, goocanvas2,
22popt, itstool, libxml2 }:
33
44stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7";
99 };
1010
11− nativeBuildInputs = [ itstool pkgconfig (lib.getBin libxml2) ];
11+ nativeBuildInputs = [ itstool pkg-config (lib.getBin libxml2) ];
1212 buildInputs = [
1313 libtool gtk3 libpcap goocanvas2 popt
1414 ];
pkgs/applications/networking/sniffers/ettercap/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
22, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz
3−, pkgconfig }:
3+, pkg-config }:
44
55stdenv.mkDerivation rec {
66 pname = "ettercap";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 strictDeps = true;
17− nativeBuildInputs = [ cmake flex bison pkgconfig ];
17+ nativeBuildInputs = [ cmake flex bison pkg-config ];
1818 buildInputs = [
1919 libpcap libnet zlib curl pcre openssl ncurses
2020 glib gtk3 atk pango geoip harfbuzz
pkgs/applications/networking/sniffers/kismet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd
1+{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd
22, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils
33, withNetworkManager ? false, glib, networkmanager
44, withPython ? false, python3
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121
2222 buildInputs = [
2323 libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc
pkgs/applications/networking/sniffers/wireshark/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
1+{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
22, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
33, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
44, withQt ? true, qt5 ? null
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
3434 NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
3535
3636 nativeBuildInputs = [
37− bison cmake flex pkgconfig
37+ bison cmake flex pkg-config
3838 ] ++ optional withQt qt5.wrapQtAppsHook;
3939
4040 buildInputs = [
pkgs/applications/networking/sniproxy/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }:
22
33stdenv.mkDerivation rec {
44 pname = "sniproxy";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ gettext libev pcre udns ];
1616
1717 meta = with lib; {
pkgs/applications/networking/sync/casync/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, meson, ninja, pkgconfig, python3, sphinx
2+, meson, ninja, pkg-config, python3, sphinx
33, acl, curl, fuse, libselinux, udev, xz, zstd
44, fuseSupport ? true
55, selinuxSupport ? true
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
2222 ++ lib.optionals (fuseSupport) [ fuse ]
2323 ++ lib.optionals (selinuxSupport) [ libselinux ]
2424 ++ lib.optionals (udevSupport) [ udev ];
25− nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ];
25+ nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ];
2626 checkInputs = [ glibcLocales rsync ];
2727
2828 postPatch = ''
pkgs/applications/networking/sync/lsyncd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync,
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync,
22 asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
33
44stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929
3030 buildInputs = [
3131 rsync
32− cmake lua pkgconfig
32+ cmake lua pkg-config
3333 asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
3434 ];
3535
pkgs/applications/networking/sync/onedrive/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkgconfig
1+{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config
22, curl, sqlite, libnotify
33, withSystemd ? stdenv.isLinux, systemd ? null }:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
1717
1818 buildInputs = [
1919 curl sqlite libnotify
pkgs/applications/networking/vnstat/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }:
1+{ lib, stdenv, fetchurl, pkg-config, gd, ncurses, sqlite, check }:
22
33stdenv.mkDerivation rec {
44 pname = "vnstat";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 substituteInPlace src/cfg.c --replace /usr/local $out
1414 '';
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ gd ncurses sqlite ];
1818
1919 checkInputs = [ check ];
pkgs/applications/networking/weather/meteo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
1+{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3
22, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script
33, libappindicator, desktop-file-utils, appstream, wrapGAppsHook }:
44
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 desktop-file-utils
1919 meson
2020 ninja
21− pkgconfig
21+ pkg-config
2222 python3
2323 vala
2424 wrapGAppsHook
pkgs/applications/networking/znc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, openssl, pkgconfig
1+{ lib, stdenv, fetchurl, openssl, pkg-config
22, withPerl ? false, perl
33, withPython ? false, python3
44, withTcl ? false, tcl
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz";
2121 };
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424
2525 buildInputs = [ openssl ]
2626 ++ optional withPerl perl
pkgs/applications/science/astronomy/celestia/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
2−, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook
2+, lua, libGLU, libGL, pkg-config, perl, autoreconfHook
33}:
44
55let
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
4343 sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
4444 };
4545
46− nativeBuildInputs = [ pkgconfig ];
46+ nativeBuildInputs = [ pkg-config ];
4747 buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua
4848 perl autoreconfHook ];
4949
pkgs/applications/science/astronomy/gildas/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif
1+{ lib, stdenv, fetchurl, gtk2-x11 , pkg-config , python3 , gfortran , lesstif
22, cfitsio , getopt , perl , groff , which, darwin, ncurses
33}:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a";
2020 };
2121
22− nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
22+ nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ];
2323
2424 buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
2525 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
pkgs/applications/science/astronomy/gpredict/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, intltool
1+{ lib, stdenv, fetchurl, pkg-config, intltool
22, gtk3, glib, curl, goocanvas2, gpsd
33, hamlib, wrapGAppsHook
44}:
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
1414 sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
17+ nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
1818 buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];
1919
2020 meta = with lib; {
pkgs/applications/science/astronomy/xplanet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff
1+{lib, stdenv, fetchurl, fetchpatch, pkg-config, freetype, pango, libpng, libtiff
22, giflib, libjpeg, netpbm}:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ];
1515
1616 patches = [
pkgs/applications/science/biology/EZminc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }:
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }:
22
33stdenv.mkDerivation rec {
44 pname = "EZminc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515 buildInputs = [ itk4 libminc bicpl fftwFloat gsl ];
1616
1717 cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
pkgs/applications/science/biology/exonerate/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, glib, pkgconfig }:
1+{ lib, stdenv, fetchurl, glib, pkg-config }:
22
33stdenv.mkDerivation rec {
44 version = "2.4.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ glib ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 meta = with lib; {
1919 description = "Generic tool for sequence alignment";
pkgs/applications/science/biology/neuron/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, automake
55, autoconf
66, libtool
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 pname = "neuron";
1717 version = "7.5";
1818
19− nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
19+ nativeBuildInputs = [ which pkg-config automake autoconf libtool ];
2020 buildInputs = [ ncurses readline python mpi iv ];
2121
2222 src = fetchurl {
pkgs/applications/science/biology/sortmerna/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }:
1+{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "sortmerna";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0r91viylzr069jm7kpcgb45kagvf8sqcj5zc1af4arl9sgfs1f3j";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515 buildInputs = [ zlib rocksdb rapidjson ];
1616
1717 cmakeFlags = [
pkgs/applications/science/biology/vcftools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }:
1+{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkg-config, perl }:
22
33stdenv.mkDerivation rec {
44 pname = "vcftools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx";
1212 };
1313
14− buildInputs = [ autoreconfHook pkgconfig zlib perl ];
14+ buildInputs = [ autoreconfHook pkg-config zlib perl ];
1515
1616 meta = with lib; {
1717 description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project";
pkgs/applications/science/chemistry/avogadro/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }:
1+{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }:
22
33stdenv.mkDerivation rec {
44 name = "avogadro-1.1.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ];
1212
13− nativeBuildInputs = [ cmake pkgconfig doxygen ];
13+ nativeBuildInputs = [ cmake pkg-config doxygen ];
1414
1515 NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h";
1616
pkgs/applications/science/electronics/dsview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake
1+{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake
22, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl
33, libsigrokdecode4dsl, python3, fetchpatch
44}:
@@ -27,7 +27,7 @@ mkDerivation rec {
2727 ./qt515.patch
2828 ];
2929
30− nativeBuildInputs = [ cmake pkgconfig ];
30+ nativeBuildInputs = [ cmake pkg-config ];
3131
3232 buildInputs = [
3333 boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, pkgconfig, autoreconfHook,
1+{ lib, stdenv, pkg-config, autoreconfHook,
22glib, libzip, libserialport, check, libusb1, libftdi,
33systemd, alsaLib, dsview
44}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 export sourceRoot=$sourceRoot/libsigrok4DSL
1313 '';
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1616
1717 buildInputs = [
1818 glib libzip libserialport libusb1 libftdi systemd check alsaLib
pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, pkgconfig, autoreconfHook,
1+{ lib, stdenv, pkg-config, autoreconfHook,
22glib, check, python3, dsview
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 export sourceRoot=$sourceRoot/libsigrokdecode4DSL
1212 '';
1313
14− nativeBuildInputs = [ pkgconfig autoreconfHook ];
14+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1515
1616 buildInputs = [
1717 python3 glib check
pkgs/applications/science/electronics/fped/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchgit
22, flex, bison, fig2dev, imagemagick, netpbm, gtk2
3−, pkgconfig
3+, pkg-config
44}:
55
66with lib;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424 nativeBuildInputs = [
2525 flex
2626 bison
27− pkgconfig
27+ pkg-config
2828 imagemagick
2929 fig2dev
3030 netpbm
pkgs/applications/science/electronics/fritzing/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig
1+{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config
22, qtbase, qtsvg, qttools, qtserialport, boost, libgit2
33}:
44
@@ -32,7 +32,7 @@ mkDerivation rec {
3232
3333 buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
3434
35− nativeBuildInputs = [ qmake pkgconfig qttools ];
35+ nativeBuildInputs = [ qmake pkg-config qttools ];
3636
3737 patches = [(fetchpatch {
3838 name = "fix-libgit2-version.patch";
pkgs/applications/science/electronics/geda/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }:
1+{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }:
22
33stdenv.mkDerivation {
44 pname = "geda";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 configureFlags = [
1313 "--disable-update-xdg-database"
1414 ];
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ guile gtk2 flex gawk perl ];
1717
1818 meta = with lib; {
pkgs/applications/science/electronics/gerbv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
1+{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
22
33stdenv.mkDerivation {
44 pname = "gerbv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
1111 };
1212
13− nativeBuildInputs = [ autoreconfHook pkgconfig ];
13+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1414 buildInputs = [ gettext libtool automake autoconf cairo gtk2 ];
1515
1616 configureFlags = ["--disable-update-desktop-database"];
pkgs/applications/science/electronics/gtkwave/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }:
1+{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }:
22
33stdenv.mkDerivation rec {
44 pname = "gtkwave";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
12+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
1313 buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ];
1414
1515 configureFlags = [
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages
1+{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages
22, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
33, fmt, graphviz, llvmPackages ? null
44}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 shopt -u extglob
2222 '';
2323
24− nativeBuildInputs = [ cmake ninja pkgconfig ];
24+ nativeBuildInputs = [ cmake ninja pkg-config ];
2525 buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ]
2626 ++ (with python3Packages; [ python pybind11 ])
2727 ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
pkgs/applications/science/electronics/horizon-eda/default.nix+2−2
@@ -13,7 +13,7 @@
1313, libuuid
1414, libzip
1515, opencascade
16−, pkgconfig
16+, pkg-config
1717, podofo
1818, python3
1919, sqlite
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151
5252 nativeBuildInputs = [
5353 boost.dev
54− pkgconfig
54+ pkg-config
5555 wrapGAppsHook
5656 ];
5757
pkgs/applications/science/electronics/hyp2mat/default.nix+2−2
@@ -7,7 +7,7 @@
77, groff
88, libharu
99, autoreconfHook
10−, pkgconfig
10+, pkg-config
1111, libpng
1212, zlib
1313}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 nativeBuildInputs = [
2727 autoreconfHook
28− pkgconfig
28+ pkg-config
2929 ];
3030
3131 buildInputs = [
pkgs/applications/science/electronics/kicad/base.nix+2−2
@@ -13,7 +13,7 @@
1313, curl
1414, openssl
1515, boost
16−, pkgconfig
16+, pkg-config
1717, doxygen
1818, pcre
1919, libpthreadstubs
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
9494 ]
9595 ;
9696
97− nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];
97+ nativeBuildInputs = [ cmake doxygen pkg-config lndir ];
9898
9999 buildInputs = [
100100 libGLU
pkgs/applications/science/electronics/pcb/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, gtk2
55, bison
66, intltool
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 };
3030
3131 nativeBuildInputs = [
32− pkgconfig
32+ pkg-config
3333 bison
3434 intltool
3535 flex
pkgs/applications/science/electronics/pulseview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, pkgconfig, cmake, glib, boost, libsigrok
1+{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok
22, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
33, pcre, librevisa, python3, qtbase, qtsvg
44}:
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 buildInputs = [
1818 glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
pkgs/applications/science/electronics/xcircuit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoreconfHook, automake, pkgconfig
1+{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config
22, cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:
33
44let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
1414 sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn";
1515 };
1616
17− nativeBuildInputs = [ autoreconfHook automake pkgconfig ];
17+ nativeBuildInputs = [ autoreconfHook automake pkg-config ];
1818 hardeningDisable = [ "format" ];
1919
2020 configureFlags = [
pkgs/applications/science/electronics/xoscope/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchurl, gtk2, pkgconfig}:
1+{lib, stdenv, fetchurl, gtk2, pkg-config}:
22
33stdenv.mkDerivation rec {
44 name = "xoscope-2.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ gtk2 ];
1313
1414 # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1
pkgs/applications/science/geometry/drgeo/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl
2−, intltool, libtool, pkgconfig }:
2+, intltool, libtool, pkg-config }:
33
44stdenv.mkDerivation rec {
55 pname = "drgeo";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 patches = [ ./struct.patch ];
1515
1616 buildInputs = [libglade gtk2 guile libxml2
17− perl intltool libtool pkgconfig];
17+ perl intltool libtool pkg-config];
1818
1919 prebuild = ''
2020 cp drgeo.desktop.in drgeo.desktop
pkgs/applications/science/logic/coq/default.nix+2−2
@@ -5,7 +5,7 @@
55# - The exact version can be specified through the `version` argument to
66# the derivation; it defaults to the latest stable version.
77
8−{ lib, stdenv, fetchzip, writeText, pkgconfig, gnumake42
8+{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
99, customOCamlPackages ? null
1010, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses
1111, buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10")
@@ -121,7 +121,7 @@ self = stdenv.mkDerivation {
121121 '';
122122 };
123123
124− nativeBuildInputs = [ pkgconfig ] ++ optional (!versionAtLeast "8.6") gnumake42;
124+ nativeBuildInputs = [ pkg-config ] ++ optional (!versionAtLeast "8.6") gnumake42;
125125 buildInputs = [ ncurses ] ++ ocamlBuildInputs
126126 ++ optionals buildIde
127127 (if versionAtLeast "8.10"
pkgs/applications/science/logic/cvc4/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkg-config
22, readline, libantlr3c, boost, jdk, python3, antlr3_4
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig cmake ];
16+ nativeBuildInputs = [ pkg-config cmake ];
1717 buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ];
1818 configureFlags = [
1919 "--enable-language-bindings=c,c++,java"
pkgs/applications/science/logic/elan/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
1+{ lib, pkg-config, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "elan";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA=";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 buildInputs = [ curl zlib openssl ];
1919
pkgs/applications/science/logic/ott/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }:
22
33stdenv.mkDerivation rec {
44 pname = "ott";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig opaline ];
14+ nativeBuildInputs = [ pkg-config opaline ];
1515 buildInputs = [ ocaml ];
1616
1717 installTargets = "ott.install";
pkgs/applications/science/logic/prooftree/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }:
1+{ lib, stdenv, fetchurl, pkg-config, ncurses, ocamlPackages }:
22
33stdenv.mkDerivation rec {
44 pname = "prooftree";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ ncurses ] ++ (with ocamlPackages; [
1414 ocaml findlib camlp5 lablgtk ]);
1515
pkgs/applications/science/logic/twelf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, smlnj, rsync }:
1+{ lib, stdenv, fetchurl, pkg-config, smlnj, rsync }:
22
33stdenv.mkDerivation rec {
44 pname = "twelf";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ smlnj rsync ];
1414
1515 buildPhase = ''
pkgs/applications/science/math/R/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
22, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib
3−, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack
3+, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
44, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch
55, withRecommendedPackages ? true
66, enableStrictBarrier ? false
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 buildInputs = [
2525 bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
2626 pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
27− pkgconfig bison imake which blas lapack curl tcl tk jdk
27+ pkg-config bison imake which blas lapack curl tcl tk jdk
2828 ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
2929
3030 patches = [
pkgs/applications/science/math/cemu/default.nix+2−2
@@ -9,7 +9,7 @@
99, qmake
1010, git
1111, libpng_apng
12−, pkgconfig
12+, pkg-config
1313}:
1414
1515mkDerivation rec {
@@ -26,7 +26,7 @@ mkDerivation rec {
2626 nativeBuildInputs = [
2727 qmake
2828 git
29− pkgconfig
29+ pkg-config
3030 ];
3131
3232 buildInputs = [
pkgs/applications/science/math/ginac/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
1+{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }:
22
33stdenv.mkDerivation rec {
44 name = "ginac-1.8.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp;
1414
15− nativeBuildInputs = [ pkgconfig python ];
15+ nativeBuildInputs = [ pkg-config python ];
1616
1717 preConfigure = "patchShebangs ginsh";
1818
pkgs/applications/science/math/nasc/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3−, pkgconfig
3+, pkg-config
44, fetchpatch
55, python3
66, meson
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 intltool # for libqalculate
4949 meson
5050 ninja
51− pkgconfig
51+ pkg-config
5252 python3
5353 vala
5454 wrapGAppsHook
pkgs/applications/science/math/pspp/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
2−, pkgconfig, gtksourceview, pango, gettext, dconf
2+, pkg-config, gtksourceview, pango, gettext, dconf
33, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
44, texinfo, ssw, python3
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig texinfo python3 ];
16+ nativeBuildInputs = [ pkg-config texinfo python3 ];
1717 buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
1818 gtksourceview pango gettext
1919 makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw
pkgs/applications/science/math/pynac/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, fetchurl
44, autoreconfHook
5−, pkgconfig
5+, pkg-config
66, flint
77, gmp
88, python3
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 nativeBuildInputs = [
3333 autoreconfHook
34− pkgconfig
34+ pkg-config
3535 ];
3636
3737 patches = [
pkgs/applications/science/math/qalculate-gtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
1+{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "qalculate-gtk";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 hardeningDisable = [ "format" ];
1515
16− nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ];
16+ nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ];
1717 buildInputs = [ libqalculate gtk3 ];
1818 enableParallelBuilding = true;
1919
pkgs/applications/science/math/rofi-calc/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, rofi-unwrapped
66, libqalculate
77, glib
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 nativeBuildInputs = [
2525 autoreconfHook
26− pkgconfig
26+ pkg-config
2727 gobject-introspection
2828 wrapGAppsHook
2929 ];
pkgs/applications/science/math/sage/default.nix+3−3
@@ -17,7 +17,7 @@ let
1717 inherit sage-src env-locations pynac singular;
1818 ecl = maxima-ecl.ecl;
1919 linbox = pkgs.linbox.override { withSage = true; };
20− pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
20+ pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
2121 };
2222 };
2323 };
@@ -56,7 +56,7 @@ let
5656 inherit env-locations;
5757 inherit python3 singular palp flint pynac pythonEnv maxima-ecl;
5858 ecl = maxima-ecl.ecl;
59− pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
59+ pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
6060 };
6161
6262 # The documentation for sage, building it takes a lot of ram.
@@ -70,7 +70,7 @@ let
7070 inherit python3 pythonEnv;
7171 inherit sage-env;
7272 inherit pynac singular maxima-ecl;
73− pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
73+ pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
7474 three = nodePackages.three;
7575 };
7676
pkgs/applications/science/math/singular/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig
1+{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkg-config
22, lib
33, fetchpatch
44, autoreconfHook
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666 nativeBuildInputs = [
6767 bison
6868 perl
69− pkgconfig
69+ pkg-config
7070 autoreconfHook
7171 ];
7272
pkgs/applications/science/misc/boinc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkgconfig, m4, curl,
1+{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl,
22libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
33sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd";
2020 };
2121
22− nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
22+ nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
2323
2424 buildInputs = [
2525 curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver
pkgs/applications/science/misc/openmodelica/default.nix+2−2
@@ -1,6 +1,6 @@
11{lib, stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
22hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which,
3−lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
3+lp_solve, omniorb, sqlite, libatomic_ops, pkg-config, file, gettext, flex, bison,
44doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }:
55
66let
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616
1717 buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
1818 hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which
19− lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
19+ lp_solve omniorb sqlite libatomic_ops pkg-config file gettext flex bison
2020 doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu
2121 git gtk2 makeWrapper];
2222
pkgs/applications/science/misc/openmvg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake
1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
22, libjpeg ? null
33, zlib ? null
44, libpng ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 buildInputs = [ libjpeg zlib libpng eigen libtiff ];
2323
24− nativeBuildInputs = [ cmake pkgconfig ];
24+ nativeBuildInputs = [ cmake pkg-config ];
2525
2626 cmakeFlags = [
2727 "-DCMAKE_CXX_FLAGS=-std=c++11"
pkgs/applications/science/misc/openmvs/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake
1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
22, eigen, opencv, ceres-solver, cgal, boost, vcg
33, gmp, mpfr, glog, gflags, libjpeg_turbo }:
44
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414
1515 buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ];
1616
17− nativeBuildInputs = [ cmake pkgconfig ];
17+ nativeBuildInputs = [ cmake pkg-config ];
1818
1919 preConfigure = ''
2020 cmakeFlagsArray=(
pkgs/applications/science/misc/root/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5
22, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre
3−, pkgconfig, python, xxHash, zlib, zstd
3+, pkg-config, python, xxHash, zlib, zstd
44, libAfterImage, giflib, libjpeg, libtiff, libpng
55, Cocoa, OpenGL, noSplash ? false }:
66
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0mqvj42nax0bmz8h83jjlwjm3xxjy1n0n10inc8csip9ly28fs64";
1414 };
1515
16− nativeBuildInputs = [ makeWrapper cmake pkgconfig ];
16+ nativeBuildInputs = [ makeWrapper cmake pkg-config ];
1717 buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ]
1818 ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
1919 ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
pkgs/applications/science/robotics/qgroundcontrol/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, mkDerivation, fetchFromGitHub, SDL2
22, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2
33, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools
4−, gst_all_1, wayland, pkgconfig
4+, gst_all_1, wayland, pkg-config
55}:
66
77mkDerivation rec {
@@ -19,7 +19,7 @@ mkDerivation rec {
1919
2020 enableParallelBuilding = true;
2121 buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
22− nativeBuildInputs = [ pkgconfig qmake qttools ];
22+ nativeBuildInputs = [ pkg-config qmake qttools ];
2323
2424 preConfigure = ''
2525 mkdir build
pkgs/applications/terminal-emulators/alacritty/default.nix+2−2
@@ -8,7 +8,7 @@
88, installShellFiles
99, makeWrapper
1010, ncurses
11−, pkgconfig
11+, pkg-config
1212, python3
1313
1414, expat
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec {
6969 installShellFiles
7070 makeWrapper
7171 ncurses
72− pkgconfig
72+ pkg-config
7373 python3
7474 ];
7575
pkgs/applications/terminal-emulators/eterm/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl
22, libX11, libXext, libXaw
3−, pkgconfig, imlib2, libast }:
3+, pkg-config, imlib2, libast }:
44
55stdenv.mkDerivation rec {
66 pname = "eterm";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ libX11 libXext libXaw imlib2 ];
1717 propagatedBuildInputs = [ libast ];
1818
pkgs/applications/terminal-emulators/evilvte/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, makeWrapper, pkgconfig,
1+{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
22 gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
33 configH ? ""
44}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515
1616 buildInputs = [
1717 gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
18− xorg.xorgproto xorg.libXext makeWrapper pkgconfig
18+ xorg.xorgproto xorg.libXext makeWrapper pkg-config
1919 ];
2020
2121 buildPhase = ''
pkgs/applications/terminal-emulators/havoc/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, pkgconfig, libxkbcommon, wayland, wayland-protocols }:
2+, pkg-config, libxkbcommon, wayland, wayland-protocols }:
33
44stdenv.mkDerivation rec {
55
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ libxkbcommon wayland wayland-protocols ];
1818
1919 dontConfigure = true;
pkgs/applications/terminal-emulators/kitty/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring,
2− harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
2+ harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel,
33 libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
44 libxkbcommon, libXi, libXext, wayland-protocols, wayland,
55 lcms2,
@@ -52,7 +52,7 @@ buildPythonApplication rec {
5252 ];
5353
5454 nativeBuildInputs = [
55− pkgconfig sphinx ncurses
55+ pkg-config sphinx ncurses
5656 installShellFiles
5757 ] ++ lib.optionals stdenv.isDarwin [
5858 imagemagick
pkgs/applications/terminal-emulators/lilyterm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, fetchFromGitHub
2−, pkgconfig
2+, pkg-config
33, autoconf, automake, intltool, gettext
44, gtk, vte
55, flavour ? "stable"
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535
3636 inherit (stuff) src version;
3737
38− nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ];
38+ nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ];
3939 buildInputs = [ gtk vte ];
4040
4141 preConfigure = "sh autogen.sh";
pkgs/applications/terminal-emulators/lxterminal/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook
1+{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook
22, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
33}:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 ];
2020
2121 nativeBuildInputs = [
22− automake autoconf intltool pkgconfig wrapGAppsHook
22+ automake autoconf intltool pkg-config wrapGAppsHook
2323 libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs
2424 ];
2525
pkgs/applications/terminal-emulators/mlterm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, autoconf, makeDesktopItem
1+{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem
22, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
33, harfbuzz #substituting glyphs with opentype fonts
44, fribidi, m17n_lib #bidi and encoding
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj";
2020 };
2121
22− nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ];
22+ nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ];
2323 buildInputs = [
2424 libX11
2525 gdk-pixbuf.dev
pkgs/applications/terminal-emulators/mrxvt/default.nix+2−2
@@ -1,11 +1,11 @@
11{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE
2−, freetype, pkgconfig, which }:
2+, freetype, pkg-config, which }:
33
44stdenv.mkDerivation {
55 name = "mrxvt-0.5.4";
66
77 buildInputs =
8− [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ];
8+ [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ];
99
1010 configureFlags = [
1111 "--with-x"
pkgs/applications/terminal-emulators/roxterm/default.nix+2−2
@@ -1,7 +1,7 @@
11{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
22, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
33, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
4−, pkgconfig, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
4+, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
55}:
66
77stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 })
2626 ];
2727
28− nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ];
28+ nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ];
2929
3030 buildInputs =
3131 [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, perlPackages, pkgconfig, fribidi }:
1+{ lib, fetchurl, perlPackages, pkg-config, fribidi }:
22
33perlPackages.buildPerlPackage rec {
44 pname = "urxvt-bidi";
@@ -9,7 +9,7 @@ perlPackages.buildPerlPackage rec {
99 sha256 = "1w65xbi4mw5acsrpv3phyzv82ghb29kpbb3b1b1gcinlfxl6f61m";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig perlPackages.ExtUtilsPkgConfig ];
12+ nativeBuildInputs = [ pkg-config perlPackages.ExtUtilsPkgConfig ];
1313 buildInputs = [ fribidi ];
1414
1515 postInstall = ''
pkgs/applications/terminal-emulators/rxvt-unicode/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, makeDesktopItem
22, libX11, libXt, libXft, libXrender
33, ncurses, fontconfig, freetype
4−, pkgconfig, gdk-pixbuf, perl
4+, pkg-config, gdk-pixbuf, perl
55, perlSupport ? true
66, gdkPixbufSupport ? true
77, unicode3Support ? true
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
3636
3737 buildInputs =
3838 [ libX11 libXt libXft ncurses # required to build the terminfo file
39− fontconfig freetype pkgconfig libXrender
39+ fontconfig freetype pkg-config libXrender
4040 ] ++ optional perlSupport perl
4141 ++ optional gdkPixbufSupport gdk-pixbuf;
4242
pkgs/applications/terminal-emulators/rxvt/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl
2−, pkgconfig, libtool
2+, pkg-config, libtool
33, libX11, libXt, libXpm }:
44
55stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libtool libX11 libXt libXpm ];
1616
1717 configurePhase = ''
pkgs/applications/terminal-emulators/sakura/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchurl
33, cmake
4−, pkgconfig
4+, pkg-config
55, gtk3
66, perl
77, vte
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos=";
2020 };
2121
22− nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ];
22+ nativeBuildInputs = [ cmake perl pkg-config makeWrapper ];
2323
2424 buildInputs = [ gtk3 vte pcre2 glib ];
2525
pkgs/applications/terminal-emulators/st/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses
1+{ lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses
22, libXft, conf ? null, patches ? [], extraLibs ? []}:
33
44with lib;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 substituteInPlace config.mk --replace "-lrt" ""
2222 '';
2323
24− nativeBuildInputs = [ pkgconfig ncurses ];
24+ nativeBuildInputs = [ pkg-config ncurses ];
2525 buildInputs = [ libX11 libXft ] ++ extraLibs;
2626
2727 installPhase = ''
pkgs/applications/terminal-emulators/st/xst.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }:
22
33with lib;
44
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
2020
2121 installPhase = ''
pkgs/applications/terminal-emulators/stupidterm/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }:
22
33stdenv.mkDerivation {
44 pname = "stupidterm";
55 version = "2019-03-26";
66
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88
99 buildInputs = [ vte gtk pcre2 ];
1010
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp";
1616 };
1717
18− makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" "binary=stupidterm" ];
18+ makeFlags = [ "PKGCONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" "binary=stupidterm" ];
1919
2020 installPhase = ''
2121 install -D stupidterm $out/bin/stupidterm
pkgs/applications/terminal-emulators/termite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
22
33let
44
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
5353
5454 buildInputs = [ vte-ng gtk3 ncurses pcre2 ];
5555
56− nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
56+ nativeBuildInputs = [ wrapGAppsHook pkg-config ];
5757
5858 outputs = [ "out" "terminfo" ];
5959
pkgs/applications/terminal-emulators/tilix/default.nix+2−2
@@ -4,7 +4,7 @@
44, meson
55, ninja
66, python3
7−, pkgconfig
7+, pkg-config
88, dmd
99, dconf
1010, dbus
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
3939 dmd
4040 meson
4141 ninja
42− pkgconfig
42+ pkg-config
4343 python3
4444 wrapGAppsHook
4545 ];
pkgs/applications/terminal-emulators/wayst/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, lib
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, freetype
66, fontconfig
77, libGL
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545
4646 makeFlags = [ "INSTALL_DIR=\${out}/bin" ];
4747
48− nativeBuildInputs = [ pkgconfig ];
48+ nativeBuildInputs = [ pkg-config ];
4949
5050 buildInputs = [
5151 fontconfig
pkgs/applications/terminal-emulators/xterm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig
1+{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config
22, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix
33, gnused, coreutils, enableDecLocator ? true }:
44
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ncurses
2626 freetype
2727 fontconfig
28− pkgconfig
28+ pkg-config
2929 xorg.libXft
3030 xorg.luit
3131 makeWrapper
pkgs/applications/version-management/bitkeeper/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, perl, gperf, bison, groff
2−, pkgconfig, libXft, pcre
2+, pkg-config, libXft, pcre
33, libtomcrypt, libtommath, lz4 }:
44
55stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 enableParallelBuilding = true;
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [
2020 perl gperf bison groff libXft
2121 pcre libtomcrypt libtommath lz4
pkgs/applications/version-management/git-and-tools/cgit/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
2−, docbook_xsl, pkgconfig, luajit
2+, docbook_xsl, pkg-config, luajit
33, coreutils, gnused, groff, docutils
44, gzip, bzip2, lzip, xz, zstd
55, python, wrapPython, pygments, markdown
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
2323 };
2424
25− nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
25+ nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ];
2626 buildInputs = [
2727 openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
2828 ];
pkgs/applications/version-management/git-and-tools/git-dit/default.nix+2−2
@@ -5,7 +5,7 @@
55, libssh
66, cmake
77, perl
8−, pkgconfig
8+, pkg-config
99, rustPlatform
1010, curl
1111, libiconv
@@ -30,7 +30,7 @@ buildRustPackage rec {
3030
3131 nativeBuildInputs = [
3232 cmake
33− pkgconfig
33+ pkg-config
3434 perl
3535 ];
3636
pkgs/applications/version-management/git-and-tools/git-gone/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }:
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "git-gone";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9";
1515
16− nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ];
16+ nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ];
1717
1818 buildInputs = [ openssl ]
1919 ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
pkgs/applications/version-management/git-and-tools/git-ignore/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }:
1+{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }:
22
33with rustPlatform;
44
@@ -15,7 +15,7 @@ buildRustPackage rec {
1515
1616 cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU=";
1717
18− nativeBuildInputs = [ pkgconfig installShellFiles ];
18+ nativeBuildInputs = [ pkg-config installShellFiles ];
1919 buildInputs = [ openssl ]
2020 ++ lib.optionals stdenv.isDarwin [
2121 darwin.apple_sdk.frameworks.Security
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, rustPlatform
44, Security
5−, pkgconfig, openssl
5+, pkg-config, openssl
66}:
77
88rustPlatform.buildRustPackage rec {
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
1818
1919 cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI=";
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
2323
2424 meta = with lib; {
pkgs/applications/version-management/git-and-tools/git/default.nix+2−2
@@ -15,7 +15,7 @@
1515, sendEmailSupport
1616, darwin
1717, withLibsecret ? false
18−, pkgconfig, glib, libsecret
18+, pkg-config, glib, libsecret
1919, gzip # needed at runtime by gitweb.cgi
2020}:
2121
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
7373 ++ lib.optionals guiSupport [tcl tk]
7474 ++ lib.optionals withpcre2 [ pcre2 ]
7575 ++ lib.optionals stdenv.isDarwin [ darwin.Security ]
76− ++ lib.optionals withLibsecret [ pkgconfig glib libsecret ];
76+ ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
7777
7878 # required to support pthread_cancel()
7979 NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
pkgs/applications/version-management/git-and-tools/gitin/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, buildGoPackage
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, libgit2_0_27
66}:
77
@@ -20,7 +20,7 @@ buildGoPackage rec {
2020
2121 goDeps = ./deps.nix;
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424 buildInputs = [ libgit2_0_27 ];
2525
2626 meta = with lib; {
pkgs/applications/version-management/git-and-tools/grv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline
1+{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline
22, cmake }:
33let
44 version = "0.3.2";
@@ -8,7 +8,7 @@ buildGoPackage {
88 inherit version;
99
1010 buildInputs = [ ncurses readline curl ];
11− nativeBuildInputs = [ pkgconfig cmake ];
11+ nativeBuildInputs = [ pkg-config cmake ];
1212
1313 goPackagePath = "github.com/rgburke/grv";
1414
pkgs/applications/version-management/git-and-tools/tig/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
2−, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig
2+, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config
33}:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b";
1414 };
1515
16− nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
16+ nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];
1717
1818 autoreconfFlags = "-I tools -v";
1919
pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
2−, bundlerEnv, pkgconfig
2+, bundlerEnv, pkg-config
33# libgit2 + dependencies
44, libgit2, openssl, zlib, pcre, http-parser }:
55
@@ -50,7 +50,7 @@ in buildGoModule rec {
5050 };
5151
5252 buildFlags = [ "-tags=static,system_libgit2" ];
53− nativeBuildInputs = [ pkgconfig ];
53+ nativeBuildInputs = [ pkg-config ];
5454 buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
5555 doCheck = false;
5656
pkgs/applications/version-management/gitoxide/default.nix+1−1
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717 buildInputs = [ openssl ]
1818 ++ lib.optionals stdenv.isDarwin [ Security ];
1919
20− # Needed to get openssl-sys to use pkgconfig.
20+ # Needed to get openssl-sys to use pkg-config.
2121 OPENSSL_NO_VENDOR = 1;
2222
2323 meta = with lib; {
pkgs/applications/version-management/gource/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
1+{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre
22, SDL2_image, freetype, glew, libGLU, libGL, boost, glm
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL
1717 boost glm freetype
pkgs/applications/version-management/guitone/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
1+{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }:
22
33let version = "1.0-mtn-head"; in
44stdenv.mkDerivation {
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919
2020 patches = [ ./parallel-building.patch ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [ qt4 qmake4Hook graphviz ];
2424
2525 qmakeFlags = [ "guitone.pro" ];
pkgs/applications/version-management/monotone-viz/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib
1+{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib
22, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
33}:
44# We need an old version of Graphviz for format compatibility reasons.
55# This version is vulnerable, but monotone-viz will never feed it bad input.
66let graphviz_2_0 = import ./graphviz-2.0.nix {
7− inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
7+ inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
88 yacc libtool fontconfig pango gd libwebp;
99 }; in
1010let inherit (gnome2) libgnomecanvas; in
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 version = "1.0.2";
1414 pname = "monotone-viz";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
1818 src = fetchurl {
1919 url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
1+{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw
22, yacc, libtool, fontconfig, pango, gd, libwebp
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [
1717 xlibsWrapper libpng libjpeg expat libXaw yacc
1818 libtool fontconfig pango gd libwebp
pkgs/applications/version-management/monotone/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, boost, zlib, botan, libidn
2−, lua, pcre, sqlite, perl, pkgconfig, expect
2+, lua, pcre, sqlite, perl, pkg-config, expect
33, bzip2, gmp, openssl
44}:
55
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
2323
24− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkg-config ];
2525 buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
2626 openssl gmp bzip2 ];
2727
pkgs/applications/window-managers/afterstep/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libjpeg, libtiff, libpng, freetype
33, fltk, gtk
44, libX11, libXext, libICE
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
2424 })
2525 ];
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828 buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
2929
30− # A strange type of bug: dbus is not immediately found by pkgconfig
30+ # A strange type of bug: dbus is not immediately found by pkg-config
3131 preConfigure = ''
3232 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"
3333 '';
pkgs/applications/window-managers/awesome/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf
1+{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
22, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
33, xcb-util-cursor, makeWrapper, pango, gobject-introspection
44, which, dbus, nettools, git, doxygen
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 doxygen
3232 imagemagick
3333 makeWrapper
34− pkgconfig
34+ pkg-config
3535 xmlto docbook_xml_dtd_45
3636 docbook_xsl findXMLCatalogs
3737 asciidoctor
pkgs/applications/window-managers/cwm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }:
22
33stdenv.mkDerivation rec {
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0f9xmki2hx10k8iisfzc7nm1l31zkf1r06pdgn06ar9w9nizrld9";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ libX11 libXinerama libXrandr libXft yacc ];
1717
1818 prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
pkgs/applications/window-managers/dwm/dwm-status.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg
1+{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
22, enableAlsaUtils ? true, alsaUtils, coreutils
33, enableNetwork ? true, dnsutils, iproute, wirelesstools }:
44
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
1818 sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh";
1919 };
2020
21− nativeBuildInputs = [ makeWrapper pkgconfig ];
21+ nativeBuildInputs = [ makeWrapper pkg-config ];
2222 buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
2323
2424 cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm";
pkgs/applications/window-managers/dzen2/default.nix+2−2
@@ -1,9 +1,9 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }:
1+{ lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }:
22
33stdenv.mkDerivation {
44 name = "dzen2-0.9.5";
55
6− nativeBuildInputs = [ pkgconfig ];
6+ nativeBuildInputs = [ pkg-config ];
77 buildInputs = [ libX11 libXft libXinerama libXpm ];
88
99 src = fetchurl {
pkgs/applications/window-managers/fbpanel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib
33}:
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
1111 };
1212 buildInputs =
13− [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ];
13+ [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ];
1414
1515 preConfigure = "patchShebangs .";
1616
pkgs/applications/window-managers/fluxbox/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, freetype, fribidi
33, libXext, libXft, libXpm, libXrandr, libXrender, xorgproto
44, libXinerama
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919
2020 buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ];
2121
pkgs/applications/window-managers/fvwm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ gestures ? false
2−, lib, stdenv, fetchurl, pkgconfig
2+, lib, stdenv, fetchurl, pkg-config
33, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
44, libXpm, libXt, librsvg, libpng, fribidi, perl
55, libstroke ? null
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [
2121 cairo fontconfig freetype
2222 libXft libXcursor libXinerama libXpm libXt
pkgs/applications/window-managers/herbstluftwm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, pkgconfig, python3, libX11, libXext, libXinerama, libXrandr, asciidoc
1+{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc
22, xdotool, xorgserver, xsetroot, xterm, runtimeShell
33, nixosTests }:
44
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
3030
3131 nativeBuildInputs = [
3232 cmake
33− pkgconfig
33+ pkg-config
3434 python3
3535 ] ++ lib.optional (!cross) asciidoc;
3636
pkgs/applications/window-managers/hikari/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchzip,
2− pkgconfig, bmake,
2+ pkg-config, bmake,
33 cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman,
44 libucl, wayland, wayland-protocols, wlroots,
55 features ? {
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875";
2424 };
2525
26− nativeBuildInputs = [ pkgconfig bmake ];
26+ nativeBuildInputs = [ pkg-config bmake ];
2727
2828 buildInputs = [
2929 cairo
pkgs/applications/window-managers/i3/easyfocus.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms
1+{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb, xcbutilkeysyms
22, xorg , i3ipc-glib , glib
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 sha256 = "1db23vzzmp0hnfss1fkd80za6d2pajx7hdwikw50pk95jq0w8wfm";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ libxcb xcbutilkeysyms xorgproto xorg.libX11.dev i3ipc-glib glib.dev ];
1818
1919 # Makefile has no rule for 'install'
pkgs/applications/window-managers/i3/i3ipc-glib.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb
1+{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb
22, autoreconfHook, json-glib, gtk-doc, which
33, gobject-introspection
44}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p";
1616 };
1717
18− nativeBuildInputs = [ autoreconfHook which pkgconfig ];
18+ nativeBuildInputs = [ autoreconfHook which pkg-config ];
1919
2020 buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ];
2121
pkgs/applications/window-managers/i3/lock-color.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb,
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb,
22 xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon,
33 libxkbfile, libjpeg_turbo, xcbutilxrm
44}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv";
1515 };
1616
17− nativeBuildInputs = [ autoreconfHook pkgconfig ];
17+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1818 buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11
1919 libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ];
2020
pkgs/applications/window-managers/i3/lock.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, lib, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
1+{ fetchurl, lib, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage,
22 xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm
1515 pam libX11 libev cairo libxkbcommon libxkbfile ];
1616
pkgs/applications/window-managers/i3/status-rust.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, rustPlatform
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, makeWrapper
66, dbus
77, libpulseaudio
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
2222
2323 cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2";
2424
25− nativeBuildInputs = [ pkgconfig makeWrapper ];
25+ nativeBuildInputs = [ pkg-config makeWrapper ];
2626
2727 buildInputs = [ dbus libpulseaudio notmuch ];
2828
pkgs/applications/window-managers/i3/status.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
1+{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
22
33stdenv.mkDerivation rec {
44 name = "i3status-2.13";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff";
99 };
1010
11− nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
11+ nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
1212 buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ];
1313
1414 makeFlags = [ "all" "PREFIX=$(out)" ];
pkgs/applications/window-managers/i3/wmfocus.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, rustPlatform
2−, xorg, python3, pkgconfig, cairo, libxkbcommon }:
2+, xorg, python3, pkg-config, cairo, libxkbcommon }:
33
44rustPlatform.buildRustPackage rec {
55 pname = "wmfocus";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414
1515 cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms";
1616
17− nativeBuildInputs = [ python3 pkgconfig ];
17+ nativeBuildInputs = [ python3 pkg-config ];
1818 buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
1919
2020 # For now, this is the only available featureset. This is also why the file is
pkgs/applications/window-managers/jwm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext
1+{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext
22, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
33, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 patches = [ ./0001-Fix-Gettext-Requirement.patch ];
1717
18− nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
18+ nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ];
1919
2020 buildInputs = [
2121 libX11
pkgs/applications/window-managers/jwm/jwm-settings-manager.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
22
33stdenv.mkDerivation {
44 pname = "jwm-settings-manager";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 nativeBuildInputs = [
1515 cmake
16− pkgconfig
16+ pkg-config
1717 gettext
1818 ];
1919
pkgs/applications/window-managers/kbdd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, dbus-glib, autoreconfHook, xorg }:
22
33stdenv.mkDerivation {
44 pname = "kbdd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ xorg.libX11 dbus-glib ];
1616
1717 meta = {
pkgs/applications/window-managers/matchbox/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }:
1+{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }:
22
33stdenv.mkDerivation rec {
44 pname = "matchbox";
55 version = "1.2";
66
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 buildInputs = [ libmatchbox ];
99 NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib";
1010
pkgs/applications/window-managers/neocomp/default.nix+2−2
@@ -17,7 +17,7 @@
1717, libXrandr
1818, libXrender
1919, pcre
20−, pkgconfig
20+, pkg-config
2121}:
2222let
2323 rev = "v0.6-17-g271e784";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151 libXrandr
5252 libXrender
5353 pcre
54− pkgconfig
54+ pkg-config
5555 ];
5656
5757 makeFlags = [
pkgs/applications/window-managers/notion/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, pkg-config
22, lua, gettext, which, groff, xmessage, xterm
33, readline, fontconfig, libX11, libXext, libSM
44, libXinerama, libXrandr, libXft
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig makeWrapper groff ];
19+ nativeBuildInputs = [ pkg-config makeWrapper groff ];
2020 buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM
2121 libXinerama libXrandr libXft xlibsWrapper ];
2222
pkgs/applications/window-managers/openbox/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, python3
1+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, python3
22, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM
33, imlib2, pango, libstartup_notification, makeWrapper }:
44
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88
99 nativeBuildInputs = [
1010 autoreconfHook
11− pkgconfig
11+ pkg-config
1212 makeWrapper
1313 python3.pkgs.wrapPython
1414 ];
pkgs/applications/window-managers/oroborus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, freetype, fribidi
33, libSM, libICE, libXt, libXaw, libXmu
44, libXext, libXft, libXpm, libXrandr
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 pname = "oroborus";
1111 version = "2.0.20";
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext
1515 libXft libXpm libXrandr libXrender xorgproto libXinerama ];
1616
pkgs/applications/window-managers/qtile/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }:
1+{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }:
22
33let cairocffi-xcffib = python37Packages.cairocffi.override {
44 withXcffib = true;
@@ -31,7 +31,7 @@ python37Packages.buildPythonApplication rec {
3131
3232 SETUPTOOLS_SCM_PRETEND_VERSION = version;
3333
34− nativeBuildInputs = [ pkgconfig ];
34+ nativeBuildInputs = [ pkg-config ];
3535 buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ];
3636
3737 pythonPath = with python37Packages; [
pkgs/applications/window-managers/ratpoison/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, perl, autoconf, automake
1+{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake
22, libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi
33, libXrandr, fontconfig, freetype, readline
44}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 "--enable-history"
2020 ];
2121
22− nativeBuildInputs = [ pkgconfig autoconf automake ];
22+ nativeBuildInputs = [ pkg-config autoconf automake ];
2323
2424 buildInputs =
2525 [ perl
pkgs/applications/window-managers/spectrwm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, xorg }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }:
22
33stdenv.mkDerivation {
44 pname = "spectrwm";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "0bf0d25yr0craksamczn2mdy6cjp27l88smihlw9bw4p6a2qhi41";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = with xorg; [
1616 libXrandr
1717 libXcursor
pkgs/applications/window-managers/sway/bg.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, meson, ninja, pkgconfig, scdoc
2+, meson, ninja, pkg-config, scdoc
33, wayland, wayland-protocols, cairo, gdk-pixbuf
44}:
55
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc";
1515 };
1616
17− nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
17+ nativeBuildInputs = [ meson ninja pkg-config scdoc ];
1818 buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
1919
2020 mesonFlags = [
pkgs/applications/window-managers/sway/idle.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, meson, ninja, pkgconfig, scdoc
2+, meson, ninja, pkg-config, scdoc
33, wayland, wayland-protocols, systemd
44}:
55
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 --replace "version: '1.5'" "version: '${version}'"
2020 '';
2121
22− nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
22+ nativeBuildInputs = [ meson ninja pkg-config scdoc ];
2323 buildInputs = [ wayland wayland-protocols systemd ];
2424
2525 mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ];
pkgs/applications/window-managers/sway/lock-effects.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub,
2− meson, ninja, pkgconfig, scdoc,
2+ meson, ninja, pkg-config, scdoc,
33 wayland, wayland-protocols, libxkbcommon,
44 cairo, gdk-pixbuf, pam
55}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
2020 '';
2121
22− nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
22+ nativeBuildInputs = [ meson ninja pkg-config scdoc ];
2323 buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
2424
2525 mesonFlags = [
pkgs/applications/window-managers/sway/lock.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub
2−, meson, ninja, pkgconfig, scdoc
2+, meson, ninja, pkg-config, scdoc
33, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
44}:
55
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 --replace "version: '1.4'" "version: '${version}'"
2020 '';
2121
22− nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
22+ nativeBuildInputs = [ meson ninja pkg-config scdoc ];
2323 buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
2424
2525 mesonFlags = [
pkgs/applications/window-managers/trayer/default.nix+2−2
@@ -1,9 +1,9 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "trayer-1.1.8";
55
6− nativeBuildInputs = [ pkgconfig ];
6+ nativeBuildInputs = [ pkg-config ];
77 buildInputs = [ gdk-pixbuf gtk2 ];
88
99 src = fetchFromGitHub {
pkgs/applications/window-managers/vwm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{lib, stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm,
1+{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm,
22libvterm}:
33
44stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 mkdir -p $out/bin $out/include
2121 '';
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424 buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ];
2525
2626 meta = with lib; {
pkgs/applications/window-managers/windowlab/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libX11, libXext, libXft }:
33
44let version = "1.40"; in
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libX11 libXext libXft ];
1616
1717 postPatch =
pkgs/applications/window-managers/windowmaker/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm
33, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm
1818 imagemagick libpng libjpeg libexif libtiff libungif libwebp ];
pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:
1+{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }:
22
33stdenv.mkDerivation rec {
44 pname = "wmsystemtray";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];
1414
1515 meta = with lib; {
pkgs/applications/window-managers/wmii-hg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which
1+{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which
22, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
33
44stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 EOF
3030 '';
3131
32− nativeBuildInputs = [ pkgconfig ];
32+ nativeBuildInputs = [ pkg-config ];
3333 buildInputs = [ unzip libixp_hg txt2tags dash python which
3434 libX11 libXrender libXext libXinerama libXrandr libXft ];
3535
pkgs/applications/window-managers/xmonad/log-applet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
1+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib
22, desktopSupport ? "gnomeflashback", xorg
33, gtk2
44, gtk3, gnome3, mate
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
2626 ;
2727
28− nativeBuildInputs = [ autoreconfHook pkgconfig ];
28+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2929
3030 configureFlags = [ "--with-panel=${desktopSupport}" ];
3131
pkgs/applications/window-managers/yabar/build.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig
1+{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config
22, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
33, configFile ? null, lib
44, rev, sha256, version, patches ? []
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919
2020 hardeningDisable = [ "format" ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [
2424 cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl
2525 alsaLib wirelesstools asciidoc libxslt makeWrapper
pkgs/build-support/build-dotnet-package/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }:
1+{ stdenv, lib, makeWrapper, pkg-config, mono, dotnetbuildhelpers }:
22
33attrsOrig @
44{ baseName
@@ -19,7 +19,7 @@ attrsOrig @
1919 attrs = {
2020 name = "${baseName}-${version}";
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [
2424 mono
2525 dotnetbuildhelpers
pkgs/build-support/build-fhs-userenv/chrootenv/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ lib, stdenv, meson, ninja, pkgconfig, glib }:
1+{ lib, stdenv, meson, ninja, pkg-config, glib }:
22
33stdenv.mkDerivation {
44 name = "chrootenv";
55 src = ./.;
66
7− nativeBuildInputs = [ meson ninja pkgconfig ];
7+ nativeBuildInputs = [ meson ninja pkg-config ];
88 buildInputs = [ glib ];
99
1010 meta = with lib; {
pkgs/build-support/dotnetbuildhelpers/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ runCommand, mono, pkgconfig }:
1+{ runCommand, mono, pkg-config }:
22 runCommand
33 "dotnetbuildhelpers"
44 { preferLocalBuild = true; }
@@ -12,7 +12,7 @@
1212 cp -v "$script" "$target"/"$scriptName"
1313 chmod 755 "$target"/"$scriptName"
1414 patchShebangs "$target"/"$scriptName"
15− substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config
15+ substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
1616 substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis
1717 done
1818 ''
pkgs/build-support/writers/default.nix+1−1
@@ -122,7 +122,7 @@ rec {
122122 pkgs.coreutils
123123 pkgs.findutils
124124 pkgs.gcc
125− pkgs.pkgconfig
125+ pkgs.pkg-config
126126 ]}
127127 export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries}
128128 gcc \
pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
1+{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }:
22
33stdenv.mkDerivation rec {
44 pname = "adoptopenjdk-icedtea-web";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig bc ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config bc ];
1616 buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ];
1717
1818 preConfigure = ''
pkgs/development/compilers/bluespec/default.nix+2−2
@@ -11,7 +11,7 @@
1111, perl
1212, flex
1313, bison
14−, pkgconfig
14+, pkg-config
1515, itktcl
1616, incrtcl
1717, tcl
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
5353 perl
5454 flex
5555 bison
56− pkgconfig
56+ pkg-config
5757 ghcWithPackages
5858 ];
5959
pkgs/development/compilers/crystal/build-package.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }:
1+{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }:
22
33{
44 # Some projects do not include a lock file, so you can pass one
@@ -61,7 +61,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
6161 buildInputs = args.buildInputs or [ ] ++ [ crystal ]
6262 ++ lib.optional (format != "crystal") shards;
6363
64− nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ];
64+ nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ];
6565
6666 buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
6767 "runHook preBuild"
pkgs/development/compilers/crystal/default.nix+3−3
@@ -18,7 +18,7 @@
1818, makeWrapper
1919, openssl
2020, pcre
21−, pkgconfig
21+, pkg-config
2222, readline
2323, tzdata
2424, which
@@ -134,7 +134,7 @@ let
134134
135135 buildInputs = commonBuildInputs extraBuildInputs;
136136
137− nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
137+ nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ];
138138
139139 makeFlags = [
140140 "CRYSTAL_CONFIG_VERSION=${version}"
@@ -158,7 +158,7 @@ let
158158
159159 install -Dm755 .build/crystal $bin/bin/crystal
160160 wrapProgram $bin/bin/crystal \
161− --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
161+ --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \
162162 --suffix CRYSTAL_PATH : lib:$lib/crystal \
163163 --suffix CRYSTAL_LIBRARY_PATH : ${
164164 lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
pkgs/development/compilers/dtc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which
1+{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
22, pythonSupport ? false, python, swig
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0li992wwd7kgy71bikanqky49y4hq3p3vx35p2hvyxy1k0wfy7i8";
1313 };
1414
15− nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
15+ nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ];
1616
1717 postPatch = ''
1818 patchShebangs pylibfdt/
pkgs/development/compilers/factor-lang/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, glib, git,
2− rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
2+ rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses,
33 pango, cairo, gtk2, gdk-pixbuf, gtkglext,
44 mesa, xorg, openssl, unzip }:
55
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 ./fuel-dir.patch
2020 ];
2121
22− buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
22+ buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper
2323 libX11 pango cairo gtk2 gdk-pixbuf gtkglext
2424 mesa libXmu libXt libICE libSM openssl unzip ];
2525
pkgs/development/compilers/flux/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }:
1+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "flux";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515
1616 meta = with lib; {
1717 description = "An interface description language used by DirectFB";
pkgs/development/compilers/fsharp/default.nix+2−2
@@ -1,6 +1,6 @@
11# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
22
3−{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
3+{ stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
44
55stdenv.mkDerivation rec {
66 pname = "fsharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ mono dotnetbuildhelpers autoconf automake which ];
1616
1717 configurePhase = ''
pkgs/development/compilers/fsharp41/default.nix+2−2
@@ -1,6 +1,6 @@
11# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
22
3−{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
3+{ stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
44
55stdenv.mkDerivation rec {
66 pname = "fsharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 autoconf
1717 automake
pkgs/development/compilers/gcc/4.8/default.nix+2−2
@@ -20,7 +20,7 @@
2020, libelf # optional, for link-time optimizations (LTO)
2121, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
2222, zlib ? null, boehmgc ? null
23−, zip ? null, unzip ? null, pkgconfig ? null
23+, zip ? null, unzip ? null, pkg-config ? null
2424, gtk2 ? null, libart_lgpl ? null
2525, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
2626, libXrender ? null, xorgproto ? null
@@ -161,7 +161,7 @@ stdenv.mkDerivation ({
161161 depsBuildBuild = [ buildPackages.stdenv.cc ];
162162 nativeBuildInputs = [ texinfo which gettext ]
163163 ++ (optional (perl != null) perl)
164− ++ (optional javaAwtGtk pkgconfig);
164+ ++ (optional javaAwtGtk pkg-config);
165165
166166 # For building runtime libs
167167 depsBuildTarget =
pkgs/development/compilers/gcc/4.9/default.nix+2−2
@@ -20,7 +20,7 @@
2020, libelf # optional, for link-time optimizations (LTO)
2121, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
2222, zlib ? null, boehmgc ? null
23−, zip ? null, unzip ? null, pkgconfig ? null
23+, zip ? null, unzip ? null, pkg-config ? null
2424, gtk2 ? null, libart_lgpl ? null
2525, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
2626, libXrender ? null, xorgproto ? null
@@ -174,7 +174,7 @@ stdenv.mkDerivation ({
174174 depsBuildBuild = [ buildPackages.stdenv.cc ];
175175 nativeBuildInputs = [ texinfo which gettext ]
176176 ++ (optional (perl != null) perl)
177− ++ (optional javaAwtGtk pkgconfig);
177+ ++ (optional javaAwtGtk pkg-config);
178178
179179 # For building runtime libs
180180 depsBuildTarget =
pkgs/development/compilers/gcc/6/default.nix+2−2
@@ -23,7 +23,7 @@
2323, isl ? null # optional, for the Graphite optimization framework.
2424, zlib ? null, boehmgc ? null
2525, gnatboot ? null
26−, zip ? null, unzip ? null, pkgconfig ? null
26+, zip ? null, unzip ? null, pkg-config ? null
2727, gtk2 ? null, libart_lgpl ? null
2828, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
2929, libXrender ? null, xorgproto ? null
@@ -190,7 +190,7 @@ stdenv.mkDerivation ({
190190 depsBuildBuild = [ buildPackages.stdenv.cc ];
191191 nativeBuildInputs = [ texinfo which gettext ]
192192 ++ (optional (perl != null) perl)
193− ++ (optional javaAwtGtk pkgconfig)
193+ ++ (optional javaAwtGtk pkg-config)
194194 ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex);
195195
196196 # For building runtime libs
pkgs/development/compilers/ghcjs-ng/default.nix+2−2
@@ -12,7 +12,7 @@
1212, makeWrapper
1313, xorg
1414, gmp
15−, pkgconfig
15+, pkg-config
1616, gcc
1717, lib
1818, ghcjsDepOverrides ? (_:_:{})
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
7373 makeWrapper
7474 xorg.lndir
7575 gmp
76− pkgconfig
76+ pkg-config
7777 ] ++ lib.optionals stdenv.isDarwin [
7878 gcc # https://github.com/ghcjs/ghcjs/issues/663
7979 ];
pkgs/development/compilers/gnu-smalltalk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, stdenv, fetchurl, pkgconfig, libtool
1+{ config, stdenv, fetchurl, pkg-config, libtool
22, zip, libffi, libsigsegv, readline, gmp
33, gnutls, gnome2, cairo, SDL, sqlite
44, emacsSupport ? config.emacsSupport or false, emacs ? null }:
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
2727
2828 # The dependencies and their justification are explained at
2929 # http://smalltalk.gnu.org/download
30− nativeBuildInputs = [ pkgconfig ];
30+ nativeBuildInputs = [ pkg-config ];
3131 buildInputs = [
3232 libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
3333 cairo SDL sqlite
pkgs/development/compilers/go/1.14.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, tzdata, iana-etc, runCommand
2−, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
2+, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
33, mailcap, runtimeShell
44, buildPackages
55, pkgsBuildTarget
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 };
4545
4646 # perl is used for testing go vet
47− nativeBuildInputs = [ perl which pkgconfig patch procps ];
47+ nativeBuildInputs = [ perl which pkg-config patch procps ];
4848 buildInputs = [ cacert pcre ]
4949 ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
5050 ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
pkgs/development/compilers/go/1.15.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, tzdata, iana-etc, runCommand
2−, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
2+, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
33, mailcap, runtimeShell
44, buildPackages
55, pkgsBuildTarget
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 };
4545
4646 # perl is used for testing go vet
47− nativeBuildInputs = [ perl which pkgconfig patch procps ];
47+ nativeBuildInputs = [ perl which pkg-config patch procps ];
4848 buildInputs = [ cacert pcre ]
4949 ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
5050 ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
pkgs/development/compilers/go/1.4.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
2−, pkgconfig
2+, pkg-config
33, pcre
44, Security }:
55
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ pcre ];
2222 depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
2323
pkgs/development/compilers/go/2-dev.nix+2−2
@@ -1,5 +1,5 @@
11{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
2−, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
2+, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
33, mailcap, runtimeShell
44, buildPackages
55, pkgsBuildTarget
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 };
4646
4747 # perl is used for testing go vet
48− nativeBuildInputs = [ perl which pkgconfig patch procps ];
48+ nativeBuildInputs = [ perl which pkg-config patch procps ];
4949 buildInputs = [ cacert pcre ]
5050 ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
5151 ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
pkgs/development/compilers/intel-graphics-compiler/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, cmake
4−, pkgconfig
4+, pkg-config
55
66, bison
77, flex
pkgs/development/compilers/intercal/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, pkgconfig
2+, pkg-config
33, bison, flex
44, makeWrapper }:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 buildInputs =
18− [ pkgconfig bison flex makeWrapper ];
18+ [ pkg-config bison flex makeWrapper ];
1919
2020 # Intercal invokes gcc, so we need an explicit PATH
2121 postInstall = ''
pkgs/development/compilers/neko/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
1+{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
22, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig git ];
14+ nativeBuildInputs = [ cmake pkg-config git ];
1515 buildInputs =
1616 [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
1717 libmysqlclient mbedtls openssl libpthreadstubs ]
pkgs/development/compilers/openjdk/11.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip
1+{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
22, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
33, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
44, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
@@ -25,7 +25,7 @@ let
2525 sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
2626 };
2727
28− nativeBuildInputs = [ pkgconfig autoconf ];
28+ nativeBuildInputs = [ pkg-config autoconf ];
2929 buildInputs = [
3030 cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
3131 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
pkgs/development/compilers/openjdk/12.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
1+{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
22, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
33, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
44, libXcursor, libXrandr, fontconfig, openjdk11
@@ -22,7 +22,7 @@ let
2222 sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
2323 };
2424
25− nativeBuildInputs = [ pkgconfig autoconf ];
25+ nativeBuildInputs = [ pkg-config autoconf ];
2626 buildInputs = [
2727 cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
2828 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
pkgs/development/compilers/openjdk/13.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
1+{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
22, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
33, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
44, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
@@ -22,7 +22,7 @@ let
2222 sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
2323 };
2424
25− nativeBuildInputs = [ pkgconfig autoconf ];
25+ nativeBuildInputs = [ pkg-config autoconf ];
2626 buildInputs = [
2727 cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
2828 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
pkgs/development/compilers/openjdk/8.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
1+{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip
22, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
33, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
44, libjpeg, giflib
@@ -83,7 +83,7 @@ let
8383
8484 outputs = [ "out" "jre" ];
8585
86− nativeBuildInputs = [ pkgconfig lndir ];
86+ nativeBuildInputs = [ pkg-config lndir ];
8787 buildInputs = [
8888 cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
8989 libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
pkgs/development/compilers/openjdk/openjfx/11.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
1+{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
22, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby
33, openjdk11-bootstrap }:
44
@@ -20,7 +20,7 @@ let
2020 };
2121
2222 buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
23− nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
23+ nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
2424
2525 dontUseCmakeConfigure = true;
2626
pkgs/development/compilers/openjdk/openjfx/15.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
2−, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
2+, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
33, ffmpeg_3, python, ruby }:
44
55let
@@ -22,7 +22,7 @@ let
2222 };
2323
2424 buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
25− nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
25+ nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
2626
2727 dontUseCmakeConfigure = true;
2828
pkgs/development/compilers/rust/cargo.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
1+{ stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib
22, installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
33, CoreFoundation, Security
44}:
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
1616 # changes hash of vendor directory otherwise
1717 dontUpdateAutotoolsGnuConfigScripts = true;
1818
19− nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ];
19+ nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ];
2020 buildInputs = [ cacert file curl python3 openssl zlib ]
2121 ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
2222
pkgs/development/compilers/rust/rls/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform
2−, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
2+, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
33, CoreFoundation, Security }:
44
55rustPlatform.buildRustPackage {
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
2828 # rls-rustc links to rustc_private crates
2929 CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
3030
31− nativeBuildInputs = [ pkgconfig cmake ];
31+ nativeBuildInputs = [ pkg-config cmake ];
3232 buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
3333 ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
3434
pkgs/development/compilers/rust/rustc.nix+2−2
@@ -2,7 +2,7 @@
22, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
33, fetchurl, file, python3
44, darwin, cmake, rust, rustPlatform
5−, pkgconfig, openssl
5+, pkg-config, openssl
66, which, libffi
77, withBundledLLVM ? false
88, enableRustcDev ? true
@@ -133,7 +133,7 @@ in stdenv.mkDerivation rec {
133133
134134 nativeBuildInputs = [
135135 file python3 rustPlatform.rust.rustc cmake
136− which libffi removeReferencesTo pkgconfig
136+ which libffi removeReferencesTo pkg-config
137137 ];
138138
139139 buildInputs = [ openssl ]
pkgs/development/compilers/sagittarius-scheme/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, cmake
4−, pkgconfig
4+, pkg-config
55, libffi
66, boehmgc
77, openssl
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 # build extensions
2828 export ${platformLdLibraryPath}="$(pwd)/build"
2929 '';
30− nativeBuildInputs = [ pkgconfig cmake ];
30+ nativeBuildInputs = [ pkg-config cmake ];
3131
3232 buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc;
3333
pkgs/development/compilers/squeak/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
2−, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
2+, libpthreadstubs, pango, pkg-config, libpulseaudio, which }:
33
44stdenv.mkDerivation rec {
55 pname = "squeak";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
1414 pango libpulseaudio which ];
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 postPatch = ''
1818 for i in squeak.in squeak.sh.in; do
pkgs/development/compilers/swi-prolog/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
22, libarchive, db, pcre, libedit, libossp_uuid, libXpm
3−, libSM, libXt, freetype, pkgconfig, fontconfig
3+, libSM, libXt, freetype, pkg-config, fontconfig
44, cmake, libyaml, Security
55, libjpeg, libX11, libXext, libXft, libXinerama
66, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626 fetchSubmodules = true;
2727 };
2828
29− nativeBuildInputs = [ cmake pkgconfig ];
29+ nativeBuildInputs = [ cmake pkg-config ];
3030
3131 buildInputs = [ gmp readline openssl
3232 libarchive libyaml db pcre libedit libossp_uuid
pkgs/development/compilers/swift/default.nix+3−3
@@ -7,7 +7,7 @@
77, perl
88, libedit
99, ninja
10−, pkgconfig
10+, pkg-config
1111, sqlite
1212, swig
1313, bash
@@ -141,7 +141,7 @@ stdenv.mkDerivation {
141141 makeWrapper
142142 ninja
143143 perl
144− pkgconfig
144+ pkg-config
145145 python
146146 rsync
147147 which
@@ -155,7 +155,7 @@ stdenv.mkDerivation {
155155 libgit2
156156 python
157157 ];
158− propagatedUserEnvPkgs = [ git pkgconfig ];
158+ propagatedUserEnvPkgs = [ git pkg-config ];
159159
160160 hardeningDisable = [ "format" ]; # for LLDB
161161
pkgs/development/compilers/vala/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook
1+{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook
22, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
33}:
44
@@ -70,7 +70,7 @@ let
7070 outputs = [ "out" "devdoc" ];
7171
7272 nativeBuildInputs = [
73− pkgconfig flex bison libxslt
73+ pkg-config flex bison libxslt
7474 ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat
7575 ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
7676 ++ extraNativeBuildInputs;
pkgs/development/guile-modules/guile-cairo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
1+{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }:
22
33stdenv.mkDerivation rec {
44 pname = "guile-cairo";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ guile cairo expat ];
1515 enableParallelBuilding = true;
pkgs/development/guile-modules/guile-fibers/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }:
22
33let
44 version = "1.0.0";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
1313 sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1717 buildInputs = [ guile texinfo ];
1818
1919 autoreconfPhase = "./autogen.sh";
pkgs/development/guile-modules/guile-gnome/default.nix+2−2
@@ -1,5 +1,5 @@
11{ fetchurl, lib, stdenv, guile, guile-lib, gwrap
2−, pkgconfig, gconf, glib, gnome_vfs, gtk2
2+, pkg-config, gconf, glib, gnome_vfs, gtk2
33, libglade, libgnome, libgnomecanvas, libgnomeui
44, pango, guile-cairo, texinfo
55}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 buildInputs = [
17− texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2
17+ texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2
1818 libglade libgnome libgnomecanvas libgnomeui pango guile-cairo
1919 ] ++ lib.optional doCheck guile-lib;
2020
pkgs/development/guile-modules/guile-lib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, guile, texinfo, pkgconfig }:
1+{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }:
22
33assert stdenv ? cc && stdenv.cc.isGNU;
44
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
1313 sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ guile texinfo ];
1818
1919 doCheck = true;
pkgs/development/guile-modules/guile-ncurses/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }:
1+{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }:
22
33let
44 name = "guile-ncurses-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
1111 sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ guile ncurses libffi ];
1616
1717 preConfigure = ''
pkgs/development/guile-modules/guile-opengl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, guile }:
1+{ lib, stdenv, fetchurl, pkg-config, guile }:
22
33let
44 name = "guile-opengl-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
1111 sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig guile ];
14+ nativeBuildInputs = [ pkg-config guile ];
1515
1616 meta = with lib; {
1717 description = "Guile bindings for the OpenGL graphics API";
pkgs/development/guile-modules/guile-reader/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkgconfig
1+{ lib, stdenv, fetchurl, fetchpatch, pkg-config
22, gperf, guile, guile-lib, libffi }:
33
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ gperf guile guile-lib libffi ];
1616
1717 GUILE_SITE="${guile-lib}/share/guile/site";
pkgs/development/guile-modules/guile-sdl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, guile, buildEnv
1+{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv
22, SDL, SDL_image, SDL_ttf, SDL_mixer
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig guile ];
14+ nativeBuildInputs = [ pkg-config guile ];
1515
1616 buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ];
1717
pkgs/development/guile-modules/guile-sdl2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, guile, libtool, pkgconfig
1+{ lib, stdenv, fetchurl, guile, libtool, pkg-config
22, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer
33}:
44
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
1414 sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m";
1515 };
1616
17− nativeBuildInputs = [ libtool pkgconfig ];
17+ nativeBuildInputs = [ libtool pkg-config ];
1818 buildInputs = [
1919 guile SDL2 SDL2_image SDL2_ttf SDL2_mixer
2020 ];
pkgs/development/guile-modules/guile-xcb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, guile, texinfo }:
1+{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }:
22
33let
44 name = "guile-xcb-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
1111 sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ guile texinfo ];
1616
1717 preConfigure = ''
pkgs/development/haskell-modules/configuration-nix.nix+1−1
@@ -500,7 +500,7 @@ self: super: builtins.intersectAttrs super {
500500 # requires autotools to build
501501 secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
502502
503− # requires libsecp256k1 in pkgconfig-depends
503+ # requires libsecp256k1 in pkg-config-depends
504504 secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1;
505505
506506 # tests require git and zsh
pkgs/development/haskell-modules/generic-builder.nix+7−7
@@ -7,7 +7,7 @@ let
77 isCross = stdenv.buildPlatform != stdenv.hostPlatform;
88 inherit (buildPackages)
99 fetchurl removeReferencesTo
10− pkgconfig coreutils gnugrep gnused glibcLocales;
10+ pkg-config coreutils gnugrep gnused glibcLocales;
1111in
1212
1313{ pname
@@ -54,7 +54,7 @@ in
5454, doCoverage ? false
5555, doHaddock ? !(ghc.isHaLVM or false)
5656, passthru ? {}
57−, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
57+, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
5858, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? []
5959, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? []
6060, testTarget ? ""
@@ -234,7 +234,7 @@ let
234234
235235 isHaskellPkg = x: x ? isHaskellLibrary;
236236
237− allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
237+ allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
238238 optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
239239
240240 depsBuildBuild = [ nativeGhc ];
@@ -243,7 +243,7 @@ let
243243 optionals doCheck testToolDepends ++
244244 optionals doBenchmark benchmarkToolDepends;
245245 nativeBuildInputs =
246− [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
246+ [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkg-config ++
247247 setupHaskellDepends ++ collectedToolDepends;
248248 propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
249249 otherBuildInputsHaskell =
@@ -285,7 +285,7 @@ let
285285 '';
286286in stdenv.lib.fix (drv:
287287
288−assert allPkgconfigDepends != [] -> pkgconfig != null;
288+assert allPkgconfigDepends != [] -> pkg-config != null;
289289
290290stdenv.mkDerivation ({
291291 name = "${pname}-${version}";
@@ -532,7 +532,7 @@ stdenv.mkDerivation ({
532532 libraryPkgconfigDepends
533533 librarySystemDepends
534534 libraryToolDepends
535− pkgconfigDepends
535+ pkg-configDepends
536536 setupHaskellDepends
537537 ;
538538 } // stdenv.lib.optionalAttrs doCheck {
@@ -616,7 +616,7 @@ stdenv.mkDerivation ({
616616
617617 depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild;
618618 nativeBuildInputs =
619− [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
619+ [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
620620 collectedToolDepends;
621621 buildInputs =
622622 otherBuildInputsSystem;
pkgs/development/haskell-modules/generic-stack-builder.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ghc, pkgconfig, glibcLocales
1+{ stdenv, ghc, pkg-config, glibcLocales
22, cacert, stack, makeSetupHook, lib }@depArgs:
33
44{ buildInputs ? []
@@ -28,7 +28,7 @@ in stdenv.mkDerivation (args // {
2828 ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales;
2929
3030 nativeBuildInputs = nativeBuildInputs
31− ++ [ ghc pkgconfig stack stackHook ];
31+ ++ [ ghc pkg-config stack stackHook ];
3232
3333 STACK_PLATFORM_VARIANT = "nix";
3434 STACK_IN_NIX_SHELL = 1;
pkgs/development/haskell-modules/lib.nix+1−1
@@ -160,7 +160,7 @@ rec {
160160 addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; });
161161
162162 addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
163− addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; });
163+ addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkg-configDepends = (drv.pkg-configDepends or []) ++ xs; });
164164
165165 addSetupDepend = drv: x: addSetupDepends drv [x];
166166 addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; });
pkgs/development/idris-modules/glfw.nix+1−1
@@ -10,7 +10,7 @@ build-idris-package {
1010
1111 idrisDeps = [ effects ];
1212
13− nativeBuildInputs = [ pkgs.pkgconfig ];
13+ nativeBuildInputs = [ pkgs.pkg-config ];
1414 extraBuildInputs = [ pkgs.glfw ];
1515
1616 postPatch = ''
pkgs/development/idris-modules/sdl2.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, effects
44, lib
5−, pkgconfig
5+, pkg-config
66, SDL2
77, SDL2_gfx
88}:
@@ -13,7 +13,7 @@ build-idris-package rec {
1313 idrisDeps = [ effects ];
1414
1515 extraBuildInputs = [
16− pkgconfig
16+ pkg-config
1717 SDL2
1818 SDL2_gfx
1919 ];
pkgs/development/interpreters/evcxr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }:
1+{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "evcxr";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
1717
18− nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
18+ nativeBuildInputs = [ pkg-config makeWrapper cmake ];
1919 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
2020 postInstall = let
2121 wrap = exe: ''
pkgs/development/interpreters/falcon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
22
33stdenv.mkDerivation {
44 pname = "falcon";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ cmake pcre zlib sqlite ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/interpreters/gtk-server/default.nix+2−2
@@ -2,7 +2,7 @@
22, glib
33, gtk3
44, libffcall
5−, pkgconfig
5+, pkg-config
66, wrapGAppsHook
77}:
88
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 cd src
2020 '';
2121
22− nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
22+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
2323 buildInputs = [ libffcall glib gtk3 ];
2424
2525 configureOptions = [ "--with-gtk3" ];
pkgs/development/interpreters/guile/1.8.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, pkgsBuildBuild, buildPackages
2−, fetchurl, makeWrapper, gawk, pkgconfig
2+, fetchurl, makeWrapper, gawk, pkg-config
33, libtool, readline, gmp
44}:
55
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 depsBuildBuild = [ buildPackages.stdenv.cc ]
2525 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2626 pkgsBuildBuild.guile_1_8;
27− nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
27+ nativeBuildInputs = [ makeWrapper gawk pkg-config ];
2828 buildInputs = [ readline libtool ];
2929
3030 propagatedBuildInputs = [
pkgs/development/interpreters/guile/2.0.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, pkgsBuildBuild, buildPackages
2−, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
2+, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
33, libffi, libtool, readline, gmp, boehmgc, libunistring
44, coverageAnalysis ? null
55}:
@@ -23,7 +23,7 @@
2323 depsBuildBuild = [ buildPackages.stdenv.cc ]
2424 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2525 pkgsBuildBuild.guile_2_0;
26− nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
26+ nativeBuildInputs = [ makeWrapper gawk pkg-config ];
2727 buildInputs = [ readline libtool libunistring libffi ];
2828
2929 propagatedBuildInputs = [
pkgs/development/interpreters/guile/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, pkgsBuildBuild, buildPackages
2−, fetchurl, makeWrapper, gawk, pkgconfig
2+, fetchurl, makeWrapper, gawk, pkg-config
33, libffi, libtool, readline, gmp, boehmgc, libunistring
44, coverageAnalysis ? null
55, fetchpatch
@@ -25,7 +25,7 @@
2525 depsBuildBuild = [ buildPackages.stdenv.cc ]
2626 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2727 pkgsBuildBuild.guile;
28− nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
28+ nativeBuildInputs = [ makeWrapper gawk pkg-config ];
2929 buildInputs = [ readline libtool libunistring libffi ];
3030
3131 propagatedBuildInputs = [
pkgs/development/interpreters/io/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
22 ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
33 libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
4− python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
4+ python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
55}:
66
77stdenv.mkDerivation {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
2121 zlib sqlite gmp libffi cairo ncurses freetype
2222 libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
2323 freeglut libsamplerate pcre libevent libedit yajl
24− pkgconfig glfw openssl libpthreadstubs libXdmcp
24+ pkg-config glfw openssl libpthreadstubs libXdmcp
2525 libmemcached python3
2626 ];
2727
pkgs/development/interpreters/lolcode/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }:
1+{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
22
33with stdenv.lib;
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig cmake doxygen ];
14+ nativeBuildInputs = [ pkg-config cmake doxygen ];
1515 buildInputs = [ readline ];
1616
1717 # Maybe it clashes with lci scientific logic software package...
pkgs/development/interpreters/love/0.10.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
1+{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
22 libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
33 libtheora, which, autoconf, automake, libtool
44}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717 sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [
2222 SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
2323 libvorbis libogg libtheora autoconf which libtool automake
pkgs/development/interpreters/love/0.7.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, SDL, libGLU, libGL, openal, lua
33, libdevil, freetype, physfs
44, libmodplug, mpg123, libvorbis, libogg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
1616 patches = [ ./0.7-gl-prototypes.patch ];
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [
2020 SDL libGLU libGL openal lua
2121 libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
pkgs/development/interpreters/love/0.8.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, SDL, libGLU, libGL, openal, lua
33, libdevil, freetype, physfs
44, libmodplug, mpg123, libvorbis, libogg
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [
1818 SDL libGLU libGL openal lua
1919 libdevil freetype physfs libmodplug mpg123 libvorbis libogg
pkgs/development/interpreters/love/0.9.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, SDL2, libGLU, libGL, openal, luajit
33, libdevil, freetype, physfs
44, libmodplug, mpg123, libvorbis, libogg
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [
1616 SDL2 libGLU libGL openal luajit
1717 libdevil freetype physfs libmodplug mpg123 libvorbis libogg
pkgs/development/interpreters/love/11.1.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
1+{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
22 libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
33 libtheora, which, autoconf, automake, libtool
44}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717 sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [
2222 SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
2323 libvorbis libogg libtheora autoconf which libtool automake
pkgs/development/interpreters/micropython/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }:
1+{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }:
22
33stdenv.mkDerivation rec {
44 pname = "micropython";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− nativeBuildInputs = [ pkgconfig python3 ];
15+ nativeBuildInputs = [ pkg-config python3 ];
1616
1717 buildInputs = [ libffi readline ];
1818
pkgs/development/interpreters/nix-exec/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, nix, git }: let
1+{ stdenv, fetchurl, pkg-config, nix, git }: let
22 version = "4.1.6";
33in stdenv.mkDerivation {
44 pname = "nix-exec";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
99 sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ nix git ];
1414
1515 NIX_CFLAGS_COMPILE = "-std=c++1y";
pkgs/development/interpreters/octave/default.nix+2−2
@@ -14,7 +14,7 @@
1414, libX11
1515, graphicsmagick
1616, pcre
17−, pkgconfig
17+, pkg-config
1818, libGL
1919, libGLU
2020, fltk
@@ -145,7 +145,7 @@ in mkDerivation rec {
145145 ]
146146 ;
147147 nativeBuildInputs = [
148− pkgconfig
148+ pkg-config
149149 gfortran
150150 # Listed here as well because it's outputs are split
151151 fftw
pkgs/development/interpreters/php/generic.nix+2−2
@@ -7,7 +7,7 @@ let
77 generic =
88 { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper
99 , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool
10− , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
10+ , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
1111 , systemd, system-sendmail, valgrind, xcbuild
1212
1313 , version
@@ -149,7 +149,7 @@ let
149149
150150 enableParallelBuilding = true;
151151
152− nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]
152+ nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ]
153153 ++ lib.optional stdenv.isDarwin xcbuild;
154154
155155 buildInputs =
pkgs/development/interpreters/pixie/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc,
1+{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
22 pypy, libffi, libedit, libuv, boost, zlib,
33 variant ? "jit", buildWithPypy ? false }:
44
@@ -32,7 +32,7 @@ let
3232 build = {flags, target}: stdenv.mkDerivation rec {
3333 pname = "pixie";
3434 version = "0-r${commit-count}-${variant}";
35− nativeBuildInputs = [ makeWrapper pkgconfig ];
35+ nativeBuildInputs = [ makeWrapper pkg-config ];
3636 buildInputs = libs;
3737 PYTHON = if buildWithPypy
3838 then "${pypy}/pypy-c/pypy-c"
pkgs/development/interpreters/python/pypy/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, substituteAll, fetchurl
2−, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security
2+, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
33, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
44, self, gdbm, db, lzma
55, python-setup-hook
@@ -49,7 +49,7 @@ in with passthru; stdenv.mkDerivation rec {
4949 inherit sha256;
5050 };
5151
52− nativeBuildInputs = [ pkgconfig ];
52+ nativeBuildInputs = [ pkg-config ];
5353 buildInputs = [
5454 bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
5555 ] ++ optionals isPy3k [
pkgs/development/interpreters/qnial/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
1+{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
22
33stdenv.mkDerivation {
44 pname = "qnial";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626
2727 buildInputs = [
2828 unzip
29− pkgconfig
29+ pkg-config
3030 ncurses
3131 ];
3232
pkgs/development/interpreters/renpy/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2
1+{ stdenv, fetchurl, python2Packages, pkg-config, SDL2
22, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
33, glib
44}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter}
3030 '';
3131
32− nativeBuildInputs = [ pkgconfig ];
32+ nativeBuildInputs = [ pkg-config ];
3333 buildInputs = [
3434 python cython wrapPython tkinter
3535 SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
pkgs/development/interpreters/spidermonkey/1.8.5.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
1+{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }:
22
33stdenv.mkDerivation {
44 pname = "spidermonkey";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111
1212 propagatedBuildInputs = [ nspr ];
1313
14− nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213;
14+ nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213;
1515 buildInputs = [ perl python2 zip ];
1616
1717 postUnpack = "sourceRoot=\${sourceRoot}/js/src";
pkgs/development/interpreters/spidermonkey/38.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
1+{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
22, libobjc }:
33
44with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 buildInputs = [ libffi readline icu zlib ]
1616 ++ stdenv.lib.optional stdenv.isDarwin libobjc;
17− nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
17+ nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
1818
1919 postUnpack = "sourceRoot=\${sourceRoot}/js/src";
2020
pkgs/development/interpreters/spidermonkey/60.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages
1+{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
22, which, readline, zlib, icu }:
33
44with stdenv.lib;
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
1818 setOutputFlags = false; # Configure script only understands --includedir
1919
2020 buildInputs = [ readline zlib icu ];
21− nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
21+ nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ];
2222
2323 patches = [
2424 # Fixed in 62.0
pkgs/development/interpreters/spidermonkey/68.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages
1+{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
22, which, readline, zlib, icu, cargo, rustc, llvmPackages }:
33
44with stdenv.lib;
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919
2020 nativeBuildInputs = [
2121 autoconf213
22− pkgconfig
22+ pkg-config
2323 perl
2424 which
2525 python2
pkgs/development/interpreters/spidermonkey/78.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, fetchpatch
44, autoconf213
5−, pkgconfig
5+, pkg-config
66, perl
77, python3
88, zip
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 cargo
3737 llvmPackages.llvm # for llvm-objdump
3838 perl
39− pkgconfig
39+ pkg-config
4040 python3
4141 rust-cbindgen
4242 rustc
pkgs/development/interpreters/supercollider/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
1+{ stdenv, fetchurl, cmake, pkg-config, alsaLib
22, libjack2, libsndfile, fftw, curl, gcc
33, libXt, qtbase, qttools, qtwebengine
44, readline, qtwebsockets, useSCEL ? false, emacs
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
2525 ];
2626
27− nativeBuildInputs = [ cmake pkgconfig qttools ];
27+ nativeBuildInputs = [ cmake pkg-config qttools ];
2828
2929 buildInputs = [
3030 gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
pkgs/development/libraries/SDL/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
1+{ stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
22, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
33, openglSupport ? libGLSupported, libGL, libGLU
44, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 outputs = [ "out" "dev" ];
3939 outputBin = "dev"; # sdl-config
4040
41− nativeBuildInputs = [ pkgconfig ]
41+ nativeBuildInputs = [ pkg-config ]
4242 ++ optional stdenv.isLinux libcap;
4343
4444 propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;
pkgs/development/libraries/SDL2/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, config, fetchurl, pkgconfig
1+{ stdenv, config, fetchurl, pkg-config
22, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
33, openglSupport ? libGLSupported, libGL
44, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
4747 --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`'
4848 '';
4949
50− depsBuildBuild = [ pkgconfig ];
50+ depsBuildBuild = [ pkg-config ];
5151
52− nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ];
52+ nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
5353
5454 propagatedBuildInputs = dlopenPropagatedBuildInputs;
5555
pkgs/development/libraries/SDL_Pango/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkgconfig }:
1+{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "SDL_Pango";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 preConfigure = "autoreconf -i -f";
2121
22− nativeBuildInputs = [ pkgconfig autoreconfHook ];
22+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2323 buildInputs = [ SDL pango ];
2424
2525 meta = with stdenv.lib; {
pkgs/development/libraries/SDL_sixel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libsixel }:
1+{ stdenv, fetchFromGitHub, pkg-config, libsixel }:
22
33stdenv.mkDerivation {
44 pname = "SDL_sixel";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 configureFlags = [ "--enable-video-sixel" ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ libsixel ];
1818
1919 meta = with stdenv.lib; {
pkgs/development/libraries/Xaw3d/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, imake, gccmakedep, bison, flex, pkgconfig
2+, imake, gccmakedep, bison, flex, pkg-config
33, xlibsWrapper, libXmu, libXpm, libXp }:
44
55stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
1010 };
1111 dontUseImakeConfigure = true;
12− nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
12+ nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ];
1313 buildInputs = [ libXpm libXp ];
1414 propagatedBuildInputs = [ xlibsWrapper libXmu ];
1515
pkgs/development/libraries/accounts-qt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }:
1+{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }:
22
33mkDerivation rec {
44 pname = "accounts-qt";
@@ -12,7 +12,7 @@ mkDerivation rec {
1212 };
1313
1414 propagatedBuildInputs = [ glib libaccounts-glib ];
15− nativeBuildInputs = [ doxygen pkgconfig qmake ];
15+ nativeBuildInputs = [ doxygen pkg-config qmake ];
1616
1717 # Hack to avoid TMPDIR in RPATHs.
1818 preFixup = ''rm -rf "$(pwd)" '';
pkgs/development/libraries/accountsservice/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, fetchpatch
44, substituteAll
5−, pkgconfig
5+, pkg-config
66, glib
77, shadow
88, gobject-introspection
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 gobject-introspection
3434 meson
3535 ninja
36− pkgconfig
36+ pkg-config
3737 python3
3838 ];
3939
pkgs/development/libraries/ace/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libtool, perl }:
1+{ stdenv, fetchurl, pkg-config, libtool, perl }:
22
33stdenv.mkDerivation rec {
44 pname = "ace";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 enableParallelBuilding = true;
1313
14− nativeBuildInputs = [ pkgconfig libtool ];
14+ nativeBuildInputs = [ pkg-config libtool ];
1515 buildInputs = [ perl ];
1616
1717 NIX_CFLAGS_COMPILE = [
pkgs/development/libraries/agg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig
1+{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config
22, freetype, SDL, libX11 }:
33
44stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
77 url = "http://www.antigrain.com/${name}.tar.gz";
88 sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
99 };
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [ autoconf automake libtool freetype SDL libX11 ];
1212
1313 postPatch = ''
pkgs/development/libraries/allegro/5.nix+2−2
@@ -3,7 +3,7 @@
33, libXxf86dga, libXxf86misc
44, libXxf86vm, openal, libGLU, libGL, libjpeg, flac
55, libXi, libXfixes, freetype, libopus, libtheora
6−, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
6+, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs
77, libXdmcp
88}:
99
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 libXxf86vm openal libGLU libGL
2525 libjpeg flac
2626 libXi libXfixes
27− enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
27+ enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp
2828 libpulseaudio libpthreadstubs
2929 ];
3030
pkgs/development/libraries/amdvlk/default.nix+2−2
@@ -5,7 +5,7 @@
55, ninja
66, patchelf
77, perl
8−, pkgconfig
8+, pkg-config
99, python3
1010, expat
1111, libdrm
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
5050 ninja
5151 patchelf
5252 perl
53− pkgconfig
53+ pkg-config
5454 python3
5555 ];
5656
pkgs/development/libraries/amtk/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, gtk3
4−, pkgconfig
4+, pkg-config
55, gobject-introspection
66, gnome3
77, dbus
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 };
1919
2020 nativeBuildInputs = [
21− pkgconfig
21+ pkg-config
2222 dbus
2323 gobject-introspection
2424 ];
pkgs/development/libraries/appstream-glib/default.nix+2−2
@@ -19,7 +19,7 @@
1919, libxslt
2020, meson
2121, ninja
22−, pkgconfig
22+, pkg-config
2323, pngquant
2424}:
2525stdenv.mkDerivation rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 libxslt
4646 meson
4747 ninja
48− pkgconfig
48+ pkg-config
4949 ];
5050
5151 buildInputs = [
pkgs/development/libraries/appstream/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext
1+{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext
22, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
33, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
44, pcre, itstool, gperf, vala, lmdb, libsoup
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 };
1919
2020 nativeBuildInputs = [
21− meson ninja pkgconfig gettext
21+ meson ninja pkg-config gettext
2222 libxslt xmlto docbook_xsl docbook_xml_dtd_45
2323 gobject-introspection itstool vala
2424 ];
pkgs/development/libraries/aqbanking/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
2−, pkgconfig, gettext, xmlsec, zlib
2+, pkg-config, gettext, xmlsec, zlib
33}:
44
55let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
2525
2626 buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ];
2727
28− nativeBuildInputs = [ pkgconfig gettext ];
28+ nativeBuildInputs = [ pkg-config gettext ];
2929
3030 meta = with stdenv.lib; {
3131 description = "An interface to banking tasks, file formats and country information";
pkgs/development/libraries/aqbanking/gwenhywfar.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext
1+{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext
22, which
33
44# GUI support
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
5353 configure
5454 '';
5555
56− nativeBuildInputs = [ pkgconfig gettext which ];
56+ nativeBuildInputs = [ pkg-config gettext which ];
5757
5858 buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
5959
pkgs/development/libraries/aqbanking/libchipcard.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }:
1+{ stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }:
22
33let
44 inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 inherit sha256;
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ gwenhywfar pcsclite zlib ];
1717
pkgs/development/libraries/aravis/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
22, audit, glib, libusb1, libxml2
33, wrapGAppsHook
44, gstreamer ? null
@@ -46,7 +46,7 @@ in
4646
4747 nativeBuildInputs = [
4848 autoreconfHook
49− pkgconfig
49+ pkg-config
5050 intltool
5151 gtk-doc
5252 ] ++ stdenv.lib.optional enableViewer wrapGAppsHook;
pkgs/development/libraries/aribb25/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitLab
44, fetchpatch
55, autoreconfHook
6−, pkgconfig
6+, pkg-config
77, pcsclite
88, PCSC
99, xcbuild
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 nativeBuildInputs = [
2727 autoreconfHook
28− pkgconfig
28+ pkg-config
2929 ] ++ lib.optional stdenv.isDarwin xcbuild;
3030 buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ];
3131
pkgs/development/libraries/arrayfire/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
22, opencl-clhpp, ocl-icd, fftw, fftwFloat
33, blas, lapack, boost, mesa, libGLU, libGL
44, freeimage, python, clfft, clblas
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838
3939 nativeBuildInputs = [
4040 cmake
41− pkgconfig
41+ pkg-config
4242 python
4343 ];
4444
pkgs/development/libraries/at-spi2-atk/default.nix+2−2
@@ -3,7 +3,7 @@
33
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77
88, at-spi2-core
99, atk
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8=";
2424 };
2525
26− nativeBuildInputs = [ meson ninja pkgconfig ];
26+ nativeBuildInputs = [ meson ninja pkg-config ];
2727 buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
2828
2929 doCheck = false; # fails with "No test data file provided"
pkgs/development/libraries/at-spi2-core/default.nix+2−2
@@ -3,7 +3,7 @@
33
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, gobject-introspection
88, gsettings-desktop-schemas
99, makeWrapper
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929
3030 outputs = [ "out" "dev" ];
3131
32− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ];
32+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ];
3333 buildInputs = [ libX11 libXtst libXi ];
3434 # In atspi-2.pc dbus-1 glib-2.0
3535 propagatedBuildInputs = [ dbus glib ];
pkgs/development/libraries/atk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
1+{ stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
22, fixDarwinDylibNames, gobject-introspection, gnome3
33}:
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 outputs = [ "out" "dev" ];
1919
20− nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]
20+ nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
2121 ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
2222
2323 propagatedBuildInputs = [
pkgs/development/libraries/atkmm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }:
1+{ stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "atkmm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 propagatedBuildInputs = [ atk glibmm ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 doCheck = true;
1919
pkgs/development/libraries/aubio/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
2−, libsndfile, pkgconfig, python, wafHook
2+, libsndfile, pkg-config, python, wafHook
33}:
44
55stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig python wafHook ];
13+ nativeBuildInputs = [ pkg-config python wafHook ];
1414 buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
1515
1616 meta = with stdenv.lib; {
pkgs/development/libraries/audio/libbs2b/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libsndfile }:
1+{ stdenv, fetchurl, pkg-config, libsndfile }:
22
33stdenv.mkDerivation rec {
44 pname = "libbs2b";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libsndfile ];
1414
1515 hardeningDisable = [ "format" ];
pkgs/development/libraries/audio/libsmf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }:
1+{ stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
22
33stdenv.mkDerivation rec {
44 version = "1.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
99 };
1010
11− nativeBuildInputs = [ autoreconfHook pkgconfig ];
11+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1212 buildInputs = [ glib ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/libraries/audio/lilv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }:
1+{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "lilv";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 patches = [ ./lilv-pkgconfig.patch ];
1313
14− nativeBuildInputs = [ pkgconfig python3 wafHook ];
14+ nativeBuildInputs = [ pkg-config python3 wafHook ];
1515 buildInputs = [ serd sord sratom ];
1616 propagatedBuildInputs = [ lv2 ];
1717
pkgs/development/libraries/audio/lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }:
1+{ stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "lv2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig wafHook ];
12+ nativeBuildInputs = [ pkg-config wafHook ];
1313 buildInputs = [ gtk2 libsndfile python3 ];
1414
1515 wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
pkgs/development/libraries/audio/lvtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
1+{ stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "lvtk";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig python wafHook ];
12+ nativeBuildInputs = [ pkg-config python wafHook ];
1313 buildInputs = [ boost gtkmm2 lv2 ];
1414
1515 enableParallelBuilding = true;
pkgs/development/libraries/audio/ntk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
1+{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "ntk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig wafHook ];
13+ nativeBuildInputs = [ pkg-config wafHook ];
1414 buildInputs = [
1515 cairo libjpeg libXft python2
1616 ];
pkgs/development/libraries/audio/raul/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
1+{ stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "raul";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig wafHook ];
15+ nativeBuildInputs = [ pkg-config wafHook ];
1616 buildInputs = [ boost gtk2 python ];
1717
1818 meta = with stdenv.lib; {
pkgs/development/libraries/audio/rtmidi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }:
1+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }:
22
33stdenv.mkDerivation rec {
44 version = "4.0.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 enableParallelBuilding = true;
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ autoconf automake libtool libjack2 alsaLib ];
1818
1919 preConfigure = ''
pkgs/development/libraries/audio/sratom/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }:
1+{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "sratom";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig wafHook python3 ];
12+ nativeBuildInputs = [ pkg-config wafHook python3 ];
1313 buildInputs = [ lv2 serd sord ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/audio/suil/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
1+{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom
22, wafHook
33, withQt4 ? true, qt4 ? null
44, withQt5 ? false, qt5 ? null }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig wafHook ];
20+ nativeBuildInputs = [ pkg-config wafHook ];
2121 buildInputs = [ gtk2 lv2 python serd sord sratom ]
2222 ++ (lib.optionals withQt4 [ qt4 ])
2323 ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix+2−2
@@ -1,7 +1,7 @@
11# set VAMP_PATH ?
22# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
33
4−{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
4+{ stdenv, fetchFromGitHub, pkg-config, libsndfile }:
55
66stdenv.mkDerivation rec {
77 pname = "vamp-plugin-sdk";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [ libsndfile ];
1919
2020 enableParallelBuilding = true;
pkgs/development/libraries/avahi/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
1+{ fetchurl, fetchpatch, stdenv, pkg-config, libdaemon, dbus, perlPackages
22, expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent
33, gtk3Support ? false, gtk3 ? null
44, qt4 ? null
@@ -13,7 +13,7 @@ assert qt4Support -> qt4 != null;
1313
1414let
1515 # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it
16− pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"'';
16+ pkg-config-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"'';
1717in
1818
1919stdenv.mkDerivation rec {
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 propagatedBuildInputs =
4444 stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
4545
46− nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ];
46+ nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ];
4747
4848 configureFlags =
4949 [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
pkgs/development/libraries/avro-c/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }:
1+{ stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
22
33let
44 version = "1.9.1";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 patchShebangs .
1616 '';
1717
18− nativeBuildInputs = [ pkgconfig cmake ];
18+ nativeBuildInputs = [ pkg-config cmake ];
1919
2020 buildInputs = [ jansson zlib ];
2121
pkgs/development/libraries/babl/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gobject-introspection
77, lcms2
88, vala
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 nativeBuildInputs = [
2323 meson
2424 ninja
25− pkgconfig
25+ pkg-config
2626 gobject-introspection
2727 vala
2828 ];
pkgs/development/libraries/bamf/default.nix+2−2
@@ -10,7 +10,7 @@
1010, libwnck3
1111, glib
1212, vala
13−, pkgconfig
13+, pkg-config
1414, libstartup_notification
1515, gobject-introspection
1616, gtk-doc
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 gobject-introspection
4444 gtk-doc
4545 libtool
46− pkgconfig
46+ pkg-config
4747 vala
4848 which
4949 wrapGAppsHook
pkgs/development/libraries/beignet/default.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, cmake
4−, pkgconfig
4+, pkg-config
55, clang-unwrapped
66, llvm
77, libdrm
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
5252
5353 nativeBuildInputs = [
5454 cmake
55− pkgconfig
55+ pkg-config
5656 python3
5757 ];
5858
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
6767 nativeBuildInputs = [
6868 cmake
6969 python3
70− pkgconfig
70+ pkg-config
7171 makeWrapper
7272 ];
7373
pkgs/development/libraries/biblesync/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }:
1+{ stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }:
22
33stdenv.mkDerivation rec {
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig cmake ];
15+ nativeBuildInputs = [ pkg-config cmake ];
1616 buildInputs = [ libuuid ];
1717
1818 meta = with stdenv.lib; {
pkgs/development/libraries/boehm-gc/7.6.6.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
1+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libatomic_ops
22, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
33}:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 buildInputs = [ libatomic_ops ];
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919
2020 outputs = [ "out" "dev" "doc" ];
2121 separateDebugInfo = stdenv.isLinux;
pkgs/development/libraries/boolstuff/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig }:
1+{ stdenv, fetchurl, pkg-config }:
22
33let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = {
1616 description = "Library for operations on boolean expression binary trees";
pkgs/development/libraries/cairo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
1+{ config, stdenv, fetchurl, fetchpatch, pkg-config, libiconv
22, libintl, expat, zlib, libpng, pixman, fontconfig, freetype
33, x11Support? !stdenv.isDarwin, libXext, libXrender
44, gobjectSupport ? true, glib
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
4444 outputBin = "dev"; # very small
4545
4646 nativeBuildInputs = [
47− pkgconfig
47+ pkg-config
4848 ];
4949
5050 buildInputs = [
pkgs/development/libraries/cairomm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }:
1+{ fetchurl, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }:
22stdenv.mkDerivation rec {
33 pname = "cairomm";
44 version = "1.12.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 outputs = [ "out" "dev" ];
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 propagatedBuildInputs = [ cairo libsigcxx ];
1717 buildInputs = [ fontconfig freetype ]
1818 ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
pkgs/development/libraries/capstone/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig }:
1+{ stdenv, fetchurl, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "capstone";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 + "PREFIX=$out ./make.sh install";
2929
3030 nativeBuildInputs = [
31− pkgconfig
31+ pkg-config
3232 ];
3333
3434 enableParallelBuilding = true;
pkgs/development/libraries/ccrtp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }:
1+{ stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }:
22
33stdenv.mkDerivation rec {
44 name = "ccrtp-2.1.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 propagatedBuildInputs = [ ucommon openssl libgcrypt ];
1313
1414 configureFlags = [
pkgs/development/libraries/clutter-gst/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
1+{ fetchurl, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
22
33stdenv.mkDerivation rec {
44 pname = "clutter-gst";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ];
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 postBuild = "rm -rf $out/share/gtk-doc";
1818
pkgs/development/libraries/clutter-gtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, meson, ninja
1+{ fetchurl, stdenv, pkg-config, meson, ninja
22, gobject-introspection, clutter, gtk3, gnome3 }:
33
44let
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 outputs = [ "out" "dev" ];
1818
1919 propagatedBuildInputs = [ clutter gtk3 ];
20− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
20+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
2121
2222 postBuild = "rm -rf $out/share/gtk-doc";
2323
pkgs/development/libraries/clutter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes
1+{ stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes
22, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
33, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 outputs = [ "out" "dev" ];
1919
2020 buildInputs = [ gtk3 ];
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 propagatedBuildInputs =
2323 [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango
2424 atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon
pkgs/development/libraries/cmrt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
22
33stdenv.mkDerivation rec {
44 pname = "cmrt";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na";
1010 };
1111
12− nativeBuildInputs = [ autoreconfHook pkgconfig ];
12+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1313
1414 buildInputs = [ libdrm libva ];
1515
pkgs/development/libraries/cogl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
1+{ stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
22, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
33, mesa, automake, autoconf
44, gstreamerSupport ? true, gst_all_1 }:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333
3434 outputs = [ "out" "dev" ];
3535
36− nativeBuildInputs = [ pkgconfig libintl automake autoconf ];
36+ nativeBuildInputs = [ pkg-config libintl automake autoconf ];
3737
3838 configureFlags = [
3939 "--enable-introspection"
pkgs/development/libraries/cre2/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook,
2− libtool, pkgconfig, re2, texinfo }:
2+ libtool, pkg-config, re2, texinfo }:
33
44stdenv.mkDerivation rec {
55 pname = "cre2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [
1616 autoreconfHook
1717 libtool
18− pkgconfig
18+ pkg-config
1919 ];
2020 buildInputs = [ re2 texinfo ];
2121
pkgs/development/libraries/ctl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }:
1+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }:
22
33stdenv.mkDerivation rec {
44 pname = "ctl";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 })
2020 ];
2121
22− nativeBuildInputs = [ cmake pkgconfig ];
22+ nativeBuildInputs = [ cmake pkg-config ];
2323 buildInputs = [ libtiff ilmbase openexr ];
2424
2525 meta = with stdenv.lib; {
pkgs/development/libraries/ctpl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib }:
1+{ stdenv, fetchurl, pkg-config, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "ctpl";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ glib ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/ctypes_sh/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchFromGitHub
3−, autoreconfHook, pkgconfig
3+, autoreconfHook, pkg-config
44, zlib, libffi, elfutils, libdwarf
55}:
66
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4";
1616 };
1717
18− nativeBuildInputs = [ autoreconfHook pkgconfig ];
18+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1919 buildInputs = [ zlib libffi elfutils libdwarf ];
2020
2121 meta = with stdenv.lib; {
pkgs/development/libraries/cutelyst/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook
22, qtbase, libuuid, libcap, uwsgi, grantlee, pcre
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c=";
1414 };
1515
16− nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
16+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
1717 buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
1818
1919 cmakeFlags = [
pkgs/development/libraries/cwiid/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "cwiid-${version}-git";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 buildInputs = [ bison flex bluez gtk2 ];
2323
24− nativeBuildInputs = [ autoreconfHook pkgconfig ];
24+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2525
2626 NIX_LDFLAGS = "-lbluetooth";
2727
pkgs/development/libraries/dav1d/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitLab
2−, meson, ninja, nasm, pkgconfig
2+, meson, ninja, nasm, pkg-config
33, withTools ? false # "dav1d" binary
44, withExamples ? false, SDL2 # "dav1dplay" binary
55, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x";
2020 };
2121
22− nativeBuildInputs = [ meson ninja nasm pkgconfig ];
22+ nativeBuildInputs = [ meson ninja nasm pkg-config ];
2323 # TODO: doxygen (currently only HTML and not build by default).
2424 buildInputs = stdenv.lib.optional withExamples SDL2
2525 ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
pkgs/development/libraries/dbus-cplusplus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
1+{ stdenv, fetchurl, dbus, glib, pkg-config, expat }:
22
33stdenv.mkDerivation rec {
44 pname = "dbus-cplusplus";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 })
3232 ];
3333
34− nativeBuildInputs = [ pkgconfig ];
34+ nativeBuildInputs = [ pkg-config ];
3535 buildInputs = [ dbus glib expat ];
3636
3737 configureFlags = [ "--disable-ecore" "--disable-tests" ];
pkgs/development/libraries/dbus-glib/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, buildPackages
2−, pkgconfig, expat, gettext, libiconv, dbus, glib
2+, pkg-config, expat, gettext, libiconv, dbus, glib
33}:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 outputs = [ "out" "dev" "devdoc" ];
1414 outputBin = "dev";
1515
16− nativeBuildInputs = [ pkgconfig gettext glib ];
16+ nativeBuildInputs = [ pkg-config gettext glib ];
1717
1818 buildInputs = [ expat libiconv ];
1919
pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }:
22
33stdenv.mkDerivation rec {
44 pname = "dbus-sharp-glib";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1616 buildInputs = [ mono dbus-sharp-1_0 ];
1717
1818 dontStrip = true;
pkgs/development/libraries/dbus-sharp-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }:
1+{ stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "dbus-sharp-glib";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1616 buildInputs = [ mono dbus-sharp-2_0 ];
1717
1818 dontStrip = true;
pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
1+{stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "dbus-sharp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1616 buildInputs = [ mono ];
1717
1818 dontStrip = true;
pkgs/development/libraries/dbus-sharp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
1+{stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "dbus-sharp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1616
1717 # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
1818 # See: https://github.com/NixOS/nixpkgs/pull/46060
pkgs/development/libraries/dbus/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, lib
33, fetchurl
4−, pkgconfig
4+, pkg-config
55, expat
66, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
77, systemd
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 outputs = [ "out" "dev" "lib" "doc" "man" ];
5858
5959 nativeBuildInputs = [
60− pkgconfig
60+ pkg-config
6161 docbook_xml_dtd_44
6262 docbook-xsl-nons
6363 xmlto
pkgs/development/libraries/dee/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchgit
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, glib
66, icu
77, gobject-introspection
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 ];
3838
3939 nativeBuildInputs = [
40− pkgconfig
40+ pkg-config
4141 vala
4242 autoreconfHook
4343 gobject-introspection
pkgs/development/libraries/directfb/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub, fetchpatch
2−, autoreconfHook, perl, pkgconfig, flux, zlib
2+, autoreconfHook, perl, pkg-config, flux, zlib
33, libjpeg, freetype, libpng, giflib
44, enableX11 ? true, xorg
55, enableSDL ? true, SDL }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 })
2626 ];
2727
28− nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ];
28+ nativeBuildInputs = [ autoreconfHook perl pkg-config flux ];
2929
3030 buildInputs = [ zlib libjpeg freetype giflib libpng ]
3131 ++ lib.optional enableSDL SDL
pkgs/development/libraries/dleyna-connector-dbus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }:
1+{ stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "dleyna-connector-dbus";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ dbus dleyna-core glib ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/dleyna-core/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, fetchpatch
44, autoreconfHook
5−, pkgconfig
5+, pkg-config
66, gupnp
77}:
88
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [
3434 autoreconfHook
35− pkgconfig
35+ pkg-config
3636 ];
3737
3838 propagatedBuildInputs = [
pkgs/development/libraries/dleyna-renderer/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, dleyna-connector-dbus
66, dleyna-core
77, gssdp
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 nativeBuildInputs = [
3333 autoreconfHook
34− pkgconfig
34+ pkg-config
3535 makeWrapper
3636 ];
3737
pkgs/development/libraries/dleyna-server/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchpatch
44, autoreconfHook
55, makeWrapper
6−, pkgconfig
6+, pkg-config
77, dleyna-core
88, dleyna-connector-dbus
99, gssdp
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535
3636 nativeBuildInputs = [
3737 autoreconfHook
38− pkgconfig
38+ pkg-config
3939 makeWrapper
4040 ];
4141
pkgs/development/libraries/dlib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libpng, libjpeg
22, guiSupport ? false, libX11
33
44 # see http://dlib.net/compile.html
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
2626 "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
2727
28− nativeBuildInputs = [ cmake pkgconfig ];
28+ nativeBuildInputs = [ cmake pkg-config ];
2929 buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11;
3030
3131 meta = with stdenv.lib; {
pkgs/development/libraries/dqlite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libco-canonical
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical
22, libuv, raft-canonical, sqlite-replication }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook file pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook file pkg-config ];
1616 buildInputs = [
1717 libco-canonical.dev
1818 libuv
pkgs/development/libraries/dssi/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
2−, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig
2+, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config
33}:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs =
1515 [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM
16− libsamplerate libtool autoconf automake xorgproto libICE pkgconfig
16+ libsamplerate libtool autoconf automake xorgproto libICE pkg-config
1717 ];
1818
1919 meta = with stdenv.lib; {
pkgs/development/libraries/dxflib/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 cp -pr *.so* $out/lib
2222 install -d -m 0755 $out/include/dxflib
2323 cp -pr src/*.h $out/include/dxflib
24− # Generate pkgconfig file
24+ # Generate pkg-config file
2525 install -d -m 0755 $out/lib/pkgconfig
2626 cat << 'EOF' > $out/lib/pkgconfig/dxflib.pc
2727 prefix=${placeholder "out"}
pkgs/development/libraries/egl-wayland/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, stdenv
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, meson
66, ninja
77, libX11
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
5858 nativeBuildInputs = [
5959 meson
6060 ninja
61− pkgconfig
61+ pkg-config
6262 ];
6363
6464 buildInputs = [
pkgs/development/libraries/elementary-cmake-modules/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }:
22
33stdenv.mkDerivation {
44 pname = "elementary-cmake-modules";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake"
1717 '';
1818
19− propagatedBuildInputs = [ cmake pkgconfig ];
19+ propagatedBuildInputs = [ cmake pkg-config ];
2020
2121 setupHook = ./setup-hook.sh;
2222
pkgs/development/libraries/embree/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
22 openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }:
33
44stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 ];
2828
2929
30− nativeBuildInputs = [ ispc pkgconfig cmake ];
30+ nativeBuildInputs = [ ispc pkg-config cmake ];
3131 buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]
3232 ++ lib.optionals stdenv.isDarwin [ glib ];
3333
pkgs/development/libraries/enchant/1.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
1+{ stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }:
22
33stdenv.mkDerivation rec {
44 version = "1.6.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ aspell glib hunspell hspell ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/epoxy/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3
22, libGL, libX11
33}:
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 outputs = [ "out" "dev" ];
1919
20− nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ];
20+ nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ];
2121 buildInputs = [ libGL libX11 ];
2222
2323 preConfigure = optionalString stdenv.isDarwin ''
pkgs/development/libraries/exosip/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }:
1+{ stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "libexosip2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libosip openssl ];
1414
1515 patches = [
pkgs/development/libraries/farstream/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, fetchpatch
44, libnice
5−, pkgconfig
5+, pkg-config
66, autoreconfHook
77, gstreamer
88, gst-plugins-base
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 ];
4444
4545 nativeBuildInputs = [
46− pkgconfig
46+ pkg-config
4747 autoreconfHook
4848 gobject-introspection
4949 ];
pkgs/development/libraries/fflas-ffpack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack
1+{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack
22, gmpxx
33}:
44
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 nativeBuildInputs = [
2525 autoreconfHook
26− pkgconfig
26+ pkg-config
2727 ] ++ stdenv.lib.optionals doCheck checkInputs;
2828
2929 buildInputs = [ givaro blas lapack ];
pkgs/development/libraries/ffmpeg-full/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
1+{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm
22/*
33 * Licensing options (yes some are listed twice, filters and such are not listed)
44 */
@@ -430,7 +430,7 @@ stdenv.mkDerivation rec {
430430 "--enable-cross-compile"
431431 ];
432432
433− nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
433+ nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ];
434434
435435 buildInputs = [
436436 bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
pkgs/development/libraries/ffmpeg-sixel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm
1+{ stdenv, fetchFromGitHub, pkg-config, libsixel, yasm
22}:
33
44stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [
1818 libsixel
1919 yasm
pkgs/development/libraries/ffmpeg/generic.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm
1+{ stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
22, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
33, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
44, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
167167 ] ++ optional stdenv.cc.isClang "--cc=clang");
168168
169169 depsBuildBuild = [ buildPackages.stdenv.cc ];
170− nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
170+ nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ];
171171
172172 buildInputs = [
173173 bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
pkgs/development/libraries/ffms/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }:
1+{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "ffms";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 NIX_CFLAGS_COMPILE = "-fPIC";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ zlib ffmpeg_3 ];
1818
1919 # ffms includes a built-in vapoursynth plugin, see:
pkgs/development/libraries/fltk/1.4.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
1+{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
22, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
33, libtiff, freetype, Cocoa, AGL, GLUT
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818
1919 patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
2323 ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
2424
pkgs/development/libraries/fltk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
1+{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
22, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
33, libtiff, freetype, Cocoa, AGL, GLUT
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818
1919 patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
2323 ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
2424
pkgs/development/libraries/folks/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl
22, stdenv
3−, pkgconfig
3+, pkg-config
44, meson
55, ninja
66, glib
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 docbook_xml_dtd_43
5757 meson
5858 ninja
59− pkgconfig
59+ pkg-config
6060 python3
6161 vala
6262 ];
pkgs/development/libraries/forge/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, fetchFromGitHub, cmake, pkg-config
22, arrayfire, expat, fontconfig, freeimage, freetype, boost
33, mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit
44}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 nativeBuildInputs = [
1919 cmake
20− pkgconfig
20+ pkg-config
2121 ];
2222
2323 buildInputs = [
pkgs/development/libraries/frame/default.nix+2−2
@@ -1,5 +1,5 @@
11{ enableX11 ? true
2−, stdenv, fetchurl, pkgconfig, xorg }:
2+, stdenv, fetchurl, pkg-config, xorg }:
33
44stdenv.mkDerivation rec {
55 pname = "frame";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [
13− stdenv pkgconfig
13+ stdenv pkg-config
1414 ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
1515
1616 configureFlags = stdenv.lib.optional enableX11 "--with-x11";
pkgs/development/libraries/freenect/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
1+{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu
22, GLUT, Cocoa
33 }:
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ]
1717 ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
1818
19− nativeBuildInputs = [ cmake pkgconfig ];
19+ nativeBuildInputs = [ cmake pkg-config ];
2020
2121 meta = {
2222 description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
pkgs/development/libraries/freetds/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig
1+{ stdenv, fetchurl, autoreconfHook, pkg-config
22, openssl
33, odbcSupport ? true, unixODBC ? null }:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 openssl
2020 ] ++ stdenv.lib.optional odbcSupport unixODBC;
2121
22− nativeBuildInputs = [ autoreconfHook pkgconfig ];
22+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2323
2424 meta = with stdenv.lib; {
2525 description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
pkgs/development/libraries/freetype/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl
22, buildPackages
3−, pkgconfig, which, makeWrapper
3+, pkg-config, which, makeWrapper
44, zlib, bzip2, libpng, gnumake, glib
55
66, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
3939 propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
4040
4141 # dependence on harfbuzz is looser than the reverse dependence
42− nativeBuildInputs = [ pkgconfig which makeWrapper ]
42+ nativeBuildInputs = [ pkg-config which makeWrapper ]
4343 # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
4444 ++ optional (!stdenv.isLinux) gnumake;
4545
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
6464
6565 postInstall = glib.flattenInclude + ''
6666 substituteInPlace $dev/bin/freetype-config \
67− --replace ${buildPackages.pkgconfig} ${pkgconfig}
67+ --replace ${buildPackages.pkg-config} ${pkg-config}
6868
6969 wrapProgram "$dev/bin/freetype-config" \
7070 --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
pkgs/development/libraries/frei0r/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }:
1+{ stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "frei0r-plugins";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
1010 };
1111
12− nativeBuildInputs = [ autoconf pkgconfig ];
12+ nativeBuildInputs = [ autoconf pkg-config ];
1313 buildInputs = [ cairo opencv ];
1414
1515 postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
pkgs/development/libraries/fribidi/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchurl
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, fixDarwinDylibNames
88, python3
99}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 patchShebangs test
2525 '';
2626
27− nativeBuildInputs = [ meson ninja pkgconfig ]
27+ nativeBuildInputs = [ meson ninja pkg-config ]
2828 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
2929
3030 depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/development/libraries/fstrm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "fstrm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 outputs = [ "bin" "out" "dev" ];
1515
16− nativeBuildInputs = [ autoreconfHook pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1717 buildInputs = [ libevent openssl ];
1818
1919 preBuild = ''
pkgs/development/libraries/gaia/default.nix+2−2
@@ -4,7 +4,7 @@
44, libyaml
55, swig
66, eigen
7−, pkgconfig
7+, pkg-config
88, python2
99, wafHook
1010, makeWrapper
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 '';
4040
4141 nativeBuildInputs = [
42− pkgconfig
42+ pkg-config
4343 python2 # For wafHook
4444 swig
4545 wafHook
pkgs/development/libraries/gamin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }:
1+{ stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
22
33let
44 cross = stdenv.hostPlatform != stdenv.buildPlatform;
@@ -10,7 +10,7 @@ in stdenv.mkDerivation (rec {
1010 sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig autoreconfHook ];
13+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1414
1515 buildInputs = [ glib ];
1616
pkgs/development/libraries/ganv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }:
1+{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "ganv";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig wafHook ];
14+ nativeBuildInputs = [ pkg-config wafHook ];
1515 buildInputs = [ graphviz gtk2 gtkmm2 python ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/gcab/default.nix+2−2
@@ -5,7 +5,7 @@
55, gtk-doc
66, docbook_xsl
77, docbook_xml_dtd_43
8−, pkgconfig
8+, pkg-config
99, meson
1010, ninja
1111, git
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 meson
3737 ninja
3838 git
39− pkgconfig
39+ pkg-config
4040 vala
4141 gettext
4242 gobject-introspection
pkgs/development/libraries/gcr/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, meson
55, ninja
66, gettext
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 outputs = [ "out" "dev" ];
4040
4141 nativeBuildInputs = [
42− pkgconfig
42+ pkg-config
4343 meson
4444 python3
4545 ninja
pkgs/development/libraries/gdata-sharp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }:
1+{ stdenv, fetchsvn, pkg-config, mono, dotnetPackages }:
22
33let
44 newtonsoft-json = dotnetPackages.NewtonsoftJson;
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
1212 sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ mono newtonsoft-json ];
1717
1818 sourceRoot = "svn-r1217/clients/cs";
pkgs/development/libraries/gdl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
1+{ stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }:
22
33stdenv.mkDerivation rec {
44 pname = "gdl";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig intltool ];
12+ nativeBuildInputs = [ pkg-config intltool ];
1313 buildInputs = [ libxml2 gtk3 ];
1414
1515 passthru = {
pkgs/development/libraries/gdome2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}:
1+{stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}:
22
33let
44 pname = "gdome2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515
1616 hardeningDisable = [ "format" ];
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ glib libxml2 gtk-doc ];
2020 propagatedBuildInputs = [glib libxml2];
2121 patches = [ ./xml-document.patch ];
pkgs/development/libraries/gegl/4.0.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, vala
66, gobject-introspection
77, gtk-doc
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 ];
5656
5757 nativeBuildInputs = [
58− pkgconfig
58+ pkg-config
5959 gettext
6060 meson
6161 ninja
pkgs/development/libraries/gegl/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, babl
55, libpng
66, cairo
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
3636 ++ stdenv.lib.optional stdenv.isDarwin OpenGL;
3737
38− nativeBuildInputs = [ pkgconfig ];
38+ nativeBuildInputs = [ pkg-config ];
3939
4040 doCheck = false; # fails 3 out of 19 tests
4141
pkgs/development/libraries/geis/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, pkgconfig
2+, pkg-config
33, python3Packages
44, wrapGAppsHook
55, atk
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 pythonPath = with python3Packages;
3737 [ pygobject3 ];
3838
39− nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
39+ nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
4040 buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
4141 gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
4242 ];
pkgs/development/libraries/geoclue/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
1+{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
22, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
33, withDemoAgent ? false
44}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 outputs = [ "out" "dev" "devdoc" ];
2525
2626 nativeBuildInputs = [
27− pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
27+ pkg-config intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
2828 # devdoc
2929 gtk-doc docbook_xsl docbook_xml_dtd_412
3030 ];
pkgs/development/libraries/geocode-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
1+{ fetchurl, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "geocode-glib";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1";
1212 };
1313
14− nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
14+ nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ];
1515 buildInputs = [ glib libsoup json-glib ];
1616
1717 patches = [
pkgs/development/libraries/gexiv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
1+{ stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
22
33stdenv.mkDerivation rec {
44 pname = "gexiv2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla";
1212 };
1313
14− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
14+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
1515 buildInputs = [ glib ];
1616 propagatedBuildInputs = [ exiv2 ];
1717
pkgs/development/libraries/gfbgraph/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts
1+{ stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts
22, gnome3, libsoup, json-glib, gobject-introspection
33, gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }:
44
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [
17− pkgconfig gobject-introspection gtk-doc
17+ pkg-config gobject-introspection gtk-doc
1818 docbook-xsl-nons autoconf automake libtool
1919 ];
2020 buildInputs = [ glib gnome-online-accounts ];
pkgs/development/libraries/gio-sharp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }:
1+{ stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }:
22
33stdenv.mkDerivation rec {
44 pname = "gio-sharp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoconf automake which ];
15+ nativeBuildInputs = [ pkg-config autoconf automake which ];
1616 buildInputs = [ mono glib gtk-sharp-2_0 ];
1717
1818 dontStrip = true;
pkgs/development/libraries/gjs/default.nix+2−2
@@ -3,7 +3,7 @@
33, stdenv
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, gnome3
88, gtk3
99, atk
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
4141 nativeBuildInputs = [
4242 meson
4343 ninja
44− pkgconfig
44+ pkg-config
4545 makeWrapper
4646 which # for locale detection
4747 libxml2 # for xml-stripblanks
pkgs/development/libraries/glib-networking/default.nix+2−2
@@ -4,7 +4,7 @@
44, meson
55, ninja
66, nixosTests
7−, pkgconfig
7+, pkg-config
88, glib
99, gettext
1010, makeWrapper
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 nativeBuildInputs = [
4545 meson
4646 ninja
47− pkgconfig
47+ pkg-config
4848 gettext
4949 makeWrapper
5050 python3 # for install_script
pkgs/development/libraries/glib-testing/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitLab
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gtk-doc
77, docbook-xsl-nons
88, docbook_xml_dtd_43
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 nativeBuildInputs = [
3333 meson
3434 ninja
35− pkgconfig
35+ pkg-config
3636 gtk-doc
3737 docbook-xsl-nons
3838 docbook_xml_dtd_43
pkgs/development/libraries/glib/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
1+{ config, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3
22, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
33# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
44, util-linuxMinimal ? null
@@ -29,7 +29,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null;
2929 * Support org.freedesktop.Application, including D-Bus activation from desktop files
3030*/
3131let
32− # Some packages don't get "Cflags" from pkgconfig correctly
32+ # Some packages don't get "Cflags" from pkg-config correctly
3333 # and then fail to build when directly including like <glib/...>.
3434 # This is intended to be run in postInstall of any package
3535 # which has $out/include/ containing just some disjunct directories.
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
100100 ]);
101101
102102 nativeBuildInputs = [
103− meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
103+ meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
104104 ];
105105
106106 propagatedBuildInputs = [ zlib libffi gettext libiconv ];
pkgs/development/libraries/glibmm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }:
1+{ stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }:
22
33stdenv.mkDerivation rec {
44 pname = "glibmm";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 outputs = [ "out" "dev" ];
1313
1414 nativeBuildInputs = [
15− pkgconfig
15+ pkg-config
1616 gnum4
1717 glib # for glib-compile-schemas
1818 ];
pkgs/development/libraries/globalplatform/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }:
1+{ stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
22
33stdenv.mkDerivation rec {
44 pname = "globalplatform";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ zlib openssl_1_0_2 pcsclite ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }:
1+{ stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
22
33stdenv.mkDerivation rec {
44 pname = "gppcscconnectionplugin";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/gmime/2.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
1+{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 version = "2.6.23";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "dev" ];
1313
14− nativeBuildInputs = [ pkgconfig gobject-introspection ];
14+ nativeBuildInputs = [ pkg-config gobject-introspection ];
1515 propagatedBuildInputs = [ glib zlib libgpgerror ];
1616 configureFlags = [ "--enable-introspection=yes" ];
1717
pkgs/development/libraries/gmime/3.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
1+{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
22, vala }:
33
44stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 outputs = [ "out" "dev" ];
1414
1515 buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ];
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 propagatedBuildInputs = [ glib ];
1818 configureFlags = [
1919 "--enable-introspection=yes"
pkgs/development/libraries/gmtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3
1+{stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3
22, libpulseaudio, mplayer, gnome_mplayer }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i";
1313 };
1414
15− nativeBuildInputs = [ libtool pkgconfig intltool ];
15+ nativeBuildInputs = [ libtool pkg-config intltool ];
1616 buildInputs = [ glib gtk3 libpulseaudio ];
1717
1818 patches = [
pkgs/development/libraries/gnet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }:
1+{stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }:
22
33stdenv.mkDerivation {
44 name = "gnet-2.0.8";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ autoconf automake glib libtool ];
1414
1515 preConfigure = "./autogen.sh";
pkgs/development/libraries/gnome-menus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-menus";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
1515 ];
1616
17− nativeBuildInputs = [ pkgconfig gettext ];
17+ nativeBuildInputs = [ pkg-config gettext ];
1818 buildInputs = [ glib gobject-introspection ];
1919
2020 passthru = {
pkgs/development/libraries/gnome-sharp/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, lib
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, gtk2
66, mono
77, gtk-sharp-2_0
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
2424 };
2525
26− nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
26+ nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
2727 buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
2828 ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
2929
pkgs/development/libraries/gnome-video-effects/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, meson
55, ninja
66, gettext
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 nativeBuildInputs = [
2626 meson
2727 ninja
28− pkgconfig
28+ pkg-config
2929 gettext
3030 ];
3131
pkgs/development/libraries/gnutls-kdh/generic.nix+3−3
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
1+{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip
22, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
33, guileBindings ? config.gnutls.guile or false, guile
44, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
@@ -62,12 +62,12 @@ stdenv.mkDerivation {
6262 ++ [ unbound ]
6363 ++ lib.optional guileBindings guile;
6464
65− nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
65+ nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs;
6666
6767 #inherit doCheck;
6868 doCheck = false;
6969
70− # Fixup broken libtool and pkgconfig files
70+ # Fixup broken libtool and pkg-config files
7171 preFixup = lib.optionalString (!stdenv.isDarwin) ''
7272 sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
7373 -e 's,-lz,-L${zlib.out}/lib -lz,' \
pkgs/development/libraries/gnutls/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
1+{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip
22, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv
33, unbound, dns-root-data, gettext, cacert, util-linux
44, guileBindings ? config.gnutls.guile or false, guile
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
4040 ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
4141
4242 # Skip some tests:
43− # - pkgconfig: building against the result won't work before installing (3.5.11)
43+ # - pkg-config: building against the result won't work before installing (3.5.11)
4444 # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular)
4545 # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11)
4646 # - psk-file: no idea; it broke between 3.6.3 and 3.6.4
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
7676 ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
7777 ++ lib.optional guileBindings guile;
7878
79− nativeBuildInputs = [ perl pkgconfig ]
79+ nativeBuildInputs = [ perl pkg-config ]
8080 ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
8181 ++ lib.optionals doCheck [ which nettools util-linux ];
8282
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
8787 # Error setting the x509 trust file: Error while reading file.
8888 checkInputs = [ cacert ];
8989
90− # Fixup broken libtool and pkgconfig files
90+ # Fixup broken libtool and pkg-config files
9191 preFixup = lib.optionalString (!isDarwin) ''
9292 sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
9393 -e 's,-lz,-L${zlib.out}/lib -lz,' \
pkgs/development/libraries/goffice/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem
1+{ fetchurl, stdenv, pkg-config, intltool, glib, gtk3, lasem
22, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig intltool ];
15+ nativeBuildInputs = [ pkg-config intltool ];
1616
1717 propagatedBuildInputs = [
1818 glib gtk3 libxml2 cairo pango libgsf lasem
pkgs/development/libraries/gom/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, glib
77, python3
88, sqlite
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 gobject-introspection
3131 meson
3232 ninja
33− pkgconfig
33+ pkg-config
3434 ];
3535
3636 buildInputs = [
pkgs/development/libraries/goocanvas/2.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
1+{ stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
22
33let
44 version = "2.0.4";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ];
16+ nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];
1717 buildInputs = [ gtk3 cairo glib gobject-introspection ];
1818
1919 configureFlags = [
pkgs/development/libraries/goocanvas/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }:
1+{ stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "goocanvas";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ gtk2 cairo glib ];
1414
1515 passthru = {
pkgs/development/libraries/goocanvasmm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "goocanvasmm";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1111 sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0";
1212 };
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ gtkmm3 goocanvas2 ];
1515
1616 enableParallelBuilding = true;
pkgs/development/libraries/gpgme/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchpatch
2−, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
2+, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan
33, file, which, ncurses
44, texinfo
55, buildPackages
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 [ libgpgerror glib libassuan pth ]
4646 ++ lib.optional (qtbase != null) qtbase;
4747
48− nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ]
48+ nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ]
4949 ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
5050
5151 depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/development/libraries/grail/default.nix+2−2
@@ -1,5 +1,5 @@
11{ enableX11 ? true,
2− stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
2+ stdenv, fetchurl, pkg-config, xorg, python3, frame }:
33
44stdenv.mkDerivation rec {
55 pname = "grail";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ python3 frame ]
1515 ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
1616
pkgs/development/libraries/graphene/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, nix-update-script
4−, pkgconfig
4+, pkg-config
55, meson
66, ninja
77, python3
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 gtk-doc
4444 meson
4545 ninja
46− pkgconfig
46+ pkg-config
4747 gobject-introspection
4848 python3
4949 ];
pkgs/development/libraries/grilo-plugins/default.nix+2−2
@@ -3,7 +3,7 @@
33, substituteAll
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, gettext
88, gperf
99, sqlite
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 nativeBuildInputs = [
5757 meson
5858 ninja
59− pkgconfig
59+ pkg-config
6060 gettext
6161 itstool
6262 gperf # for lua-factory
pkgs/development/libraries/grilo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
1+{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43
33, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
44
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 ];
2424
2525 nativeBuildInputs = [
26− meson ninja pkgconfig gettext gobject-introspection vala
26+ meson ninja pkg-config gettext gobject-introspection vala
2727 gtk-doc docbook_xsl docbook_xml_dtd_43
2828 ];
2929 buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ];
pkgs/development/libraries/gsettings-desktop-schemas/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, glib
55, gobject-introspection
66, meson
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 glib
2424 meson
2525 ninja
26− pkgconfig
26+ pkg-config
2727 python3
2828 ];
2929
pkgs/development/libraries/gsettings-qt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig
1+{ stdenv, fetchFromGitLab, pkg-config
22, qmake, qtbase, qtdeclarative, wrapQtAppsHook
33, glib, gobject-introspection
44, genericUpdater, common-updater-scripts
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 nativeBuildInputs = [
20− pkgconfig
20+ pkg-config
2121 qmake
2222 gobject-introspection
2323 wrapQtAppsHook
pkgs/development/libraries/gsignond/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
1+{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking
22, sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl
33, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
44, symlinkJoin, gsignondPlugins, plugins }:
@@ -26,7 +26,7 @@ unwrapped = stdenv.mkDerivation rec {
2626 gtk-doc
2727 meson
2828 ninja
29− pkgconfig
29+ pkg-config
3030 vala
3131 ];
3232
pkgs/development/libraries/gsignond/plugins/lastfm.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
1+{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
22
33stdenv.mkDerivation {
44 pname = "gsignond-plugin-lastfm";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 gobject-introspection
1616 meson
1717 ninja
18− pkgconfig
18+ pkg-config
1919 vala
2020 ];
2121
pkgs/development/libraries/gsignond/plugins/mail.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
1+{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 pname = "gsignond-plugin-mail";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 gobject-introspection
1616 meson
1717 ninja
18− pkgconfig
18+ pkg-config
1919 vala
2020 ];
2121
pkgs/development/libraries/gsignond/plugins/oauth.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check
1+{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check
22, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
33, docbook_xsl, glibcLocales, gobject-introspection }:
44
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 gtk-doc
2424 meson
2525 ninja
26− pkgconfig
26+ pkg-config
2727 ];
2828
2929 buildInputs = [
pkgs/development/libraries/gsignond/plugins/sasl.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
1+{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check
22, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
33
44stdenv.mkDerivation {
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
2222 gtk-doc
2323 meson
2424 ninja
25− pkgconfig
25+ pkg-config
2626 ];
2727
2828 buildInputs = [
pkgs/development/libraries/gsound/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gsound";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ];
12+ nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ];
1313 buildInputs = [ glib libcanberra ];
1414
1515 passthru = {
pkgs/development/libraries/gspell/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, libxml2
55, glib
66, gtk3
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 };
2525
2626 nativeBuildInputs = [
27− pkgconfig
27+ pkg-config
2828 vala
2929 gobject-introspection
3030 libxml2
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 ];
3838
3939 propagatedBuildInputs = [
40− # required for pkgconfig
40+ # required for pkg-config
4141 enchant2
4242 ];
4343
pkgs/development/libraries/gssdp/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gobject-introspection
77, vala
88, gtk-doc
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 nativeBuildInputs = [
2929 meson
3030 ninja
31− pkgconfig
31+ pkg-config
3232 gobject-introspection
3333 vala
3434 gtk-doc
pkgs/development/libraries/gstreamer/bad/default.nix+2−2
@@ -5,7 +5,7 @@
55, ninja
66, gettext
77, config
8−, pkgconfig
8+, pkg-config
99, python3
1010, gst-plugins-base
1111, orc
@@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
105105 nativeBuildInputs = [
106106 meson
107107 ninja
108− pkgconfig
108+ pkg-config
109109 orc # for orcc
110110 python3
111111 gettext
pkgs/development/libraries/gstreamer/base/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, lib
4−, pkgconfig
4+, pkg-config
55, meson
66, ninja
77, gettext
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 nativeBuildInputs = [
5757 meson
5858 ninja
59− pkgconfig
59+ pkg-config
6060 python3
6161 gettext
6262 orc
pkgs/development/libraries/gstreamer/core/default.nix+3−3
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gettext
77, gobject-introspection
88, bison
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 nativeBuildInputs = [
4545 meson
4646 ninja
47− pkgconfig
47+ pkg-config
4848 gettext
4949 bison
5050 flex
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
7777 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
7878 "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
7979 ] ++ lib.optionals stdenv.isDarwin [
80− # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it.
80+ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
8181 "-Dlibunwind=disabled"
8282 "-Dlibdw=disabled"
8383 ];
pkgs/development/libraries/gstreamer/devtools/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gstreamer
77, gst-plugins-base
88, python3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 nativeBuildInputs = [
3333 meson
3434 ninja
35− pkgconfig
35+ pkg-config
3636 gobject-introspection
3737
3838 # documentation
pkgs/development/libraries/gstreamer/ges/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, python3
77, bash-completion
88, gst-plugins-base
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 nativeBuildInputs = [
3737 meson
3838 ninja
39− pkgconfig
39+ pkg-config
4040 gettext
4141 gobject-introspection
4242 gst-devtools
pkgs/development/libraries/gstreamer/good/default.nix+2−2
@@ -3,7 +3,7 @@
33, meson
44, nasm
55, ninja
6−, pkgconfig
6+, pkg-config
77, python3
88, gst-plugins-base
99, orc
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
6161 };
6262
6363 nativeBuildInputs = [
64− pkgconfig
64+ pkg-config
6565 python3
6666 meson
6767 ninja
pkgs/development/libraries/gstreamer/gstreamermm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }:
22stdenv.mkDerivation rec {
33 pname = "gstreamermm";
44 version = "1.10.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 outputs = [ "out" "dev" ];
1212
13− nativeBuildInputs = [ pkgconfig file ];
13+ nativeBuildInputs = [ pkg-config file ];
1414
1515 propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ];
1616
pkgs/development/libraries/gstreamer/libav/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchurl
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, python3
88, gst-plugins-base
99, gettext
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 meson
2929 ninja
3030 gettext
31− pkgconfig
31+ pkg-config
3232 python3
3333 ];
3434
pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, python3
77, gettext
88, gobject-introspection
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 ninja
4040 gettext
4141 gobject-introspection
42− pkgconfig
42+ pkg-config
4343 python3
4444
4545 # documentation
pkgs/development/libraries/gstreamer/ugly/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, python3
77, gst-plugins-base
88, orc
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 meson
3535 ninja
3636 gettext
37− pkgconfig
37+ pkg-config
3838 python3
3939 ];
4040
pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gst-plugins-base
77, bzip2
88, libva
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 nativeBuildInputs = [
3838 meson
3939 ninja
40− pkgconfig
40+ pkg-config
4141 bzip2
4242
4343 # documentation
pkgs/development/libraries/gtdialog/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}:
1+{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}:
22let
33 s = # Generated upstream information
44 rec {
@@ -9,7 +9,7 @@ let
99 url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
1010 sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
1111 };
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [
1414 cdk unzip gtk2 glib ncurses
1515 ];
pkgs/development/libraries/gtk-engine-bluecurve/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
1+{ stdenv, fetchurl, pkg-config, intltool, gtk2 }:
22
33stdenv.mkDerivation {
44 name = "gtk-engine-bluecurve-1.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
99 };
1010
11− nativeBuildInputs = [ pkgconfig intltool ];
11+ nativeBuildInputs = [ pkg-config intltool ];
1212
1313 buildInputs = [ gtk2 ];
1414
pkgs/development/libraries/gtk-engine-murrine/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
1+{ stdenv, fetchurl, pkg-config, intltool, gtk2 }:
22
33stdenv.mkDerivation rec {
44 pname = "gtk-engine-murrine";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ intltool gtk2 ];
1414
1515 meta = {
pkgs/development/libraries/gtk-engines/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
1+{ stdenv, fetchurl, pkg-config, intltool, gtk2 }:
22
33stdenv.mkDerivation {
44 name = "gtk-engines-2.20.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ intltool gtk2 ];
1313
1414 meta = {
pkgs/development/libraries/gtk-mac-integration/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }:
1+{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 pname = "gtk-mac-integration";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ];
1616 buildInputs = [ glib ];
1717 propagatedBuildInputs = [ gtk ];
1818
pkgs/development/libraries/gtk-sharp-beans/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }:
22
33stdenv.mkDerivation rec {
44 pname = "gtk-sharp-beans";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook which ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook which ];
1616 buildInputs = [ mono gtk-sharp-2_0 gio-sharp ];
1717
1818 dontStrip = true;
pkgs/development/libraries/gtk-sharp/2.0.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, lib
33, fetchFromGitHub
4−, pkgconfig
4+, pkg-config
55, mono
66, glib
77, pango
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 popd
4444 '';
4545
46− nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
46+ nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
4747
4848 buildInputs = [
4949 mono glib pango gtk2 GConf libglade libgnomecanvas
pkgs/development/libraries/gtk-sharp/3.0.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, mono
66, glib
77, pango
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34";
2929 };
3030
31− nativeBuildInputs = [ pkgconfig ];
31+ nativeBuildInputs = [ pkg-config ];
3232 buildInputs = [
3333 mono glib pango gtk3 GConf libglade libgnomecanvas
3434 libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
pkgs/development/libraries/gtk/2.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
1+{ config, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
22, gdk-pixbuf, xlibsWrapper, gobject-introspection
33, xineramaSupport ? stdenv.isLinux
44, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 ./hooks/drop-icon-theme-cache.sh
3232 ];
3333
34− nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ];
34+ nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
3535
3636 patches = [
3737 ./patches/2.0-immodules.cache.patch
pkgs/development/libraries/gtk/3.x.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, gettext
66, docbook_xsl
77, docbook_xml_dtd_43
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
117117 makeWrapper
118118 meson
119119 ninja
120− pkgconfig
120+ pkg-config
121121 python3
122122 sassc
123123 ] ++ setupHooks ++ optionals withGtkDoc [
pkgs/development/libraries/gtkd/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
2−, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }:
2+, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
33
44let
55 inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
1515 stripRoot = false;
1616 };
1717
18− nativeBuildInputs = [ dmd pkgconfig which ];
18+ nativeBuildInputs = [ dmd pkg-config which ];
1919 propagatedBuildInputs = [
2020 atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
2121 libgda libpeas librsvg pango vte
@@ -117,7 +117,7 @@ in stdenv.mkDerivation rec {
117117
118118 makeFlags = [
119119 "prefix=${placeholder "out"}"
120− "PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
120+ "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
121121 ];
122122
123123 # The .pc files does not declare an `includedir=`, so the multiple
pkgs/development/libraries/gtkdatabox/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk2 }:
1+{ stdenv, fetchurl, pkg-config, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "gtkdatabox-0.9.3.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212
1313 propagatedBuildInputs = [ gtk2 ];
1414
pkgs/development/libraries/gtkimageview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, gtk2 }:
1+{ fetchurl, stdenv, pkg-config, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "gtkimageview-1.6.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ gtk2 ];
1313
1414 preConfigure = ''
pkgs/development/libraries/gtkmathview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
1+{stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
22
33let
44 pname = "gtkmathview";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ t1lib glib gmetadom libxml2 popt];
1818 propagatedBuildInputs = [gtk2 t1lib];
1919
pkgs/development/libraries/gtkmm/2.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }:
1+{ stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }:
22
33stdenv.mkDerivation rec {
44 name = "gtkmm-${minVer}.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "dev" ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];
1717
pkgs/development/libraries/gtkmm/3.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gtkmm";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "dev" ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ epoxy ];
1616
1717 propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
pkgs/development/libraries/gtksourceview/3.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
1+{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
22, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
33
44stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 outputs = [ "out" "dev" ];
2121
22− nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ];
22+ nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
2323
2424 checkInputs = [ xvfb_run dbus ];
2525
pkgs/development/libraries/gtksourceview/4.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala
1+{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
22, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
33, meson, ninja }:
44
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 outputs = [ "out" "dev" ];
2222
23− nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ];
23+ nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ];
2424
2525 checkInputs = [ xvfb_run dbus ];
2626
pkgs/development/libraries/gtksourceviewmm/4.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gtksourceviewmm";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 };
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ];
2121
2222 meta = with stdenv.lib; {
pkgs/development/libraries/gtksourceviewmm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gtksourceviewmm";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 };
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
2121
2222 meta = with stdenv.lib; {
pkgs/development/libraries/gtkspell/3.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
1+{stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}:
22
33stdenv.mkDerivation rec {
44 pname = "gtkspell";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ];
14+ nativeBuildInputs = [ pkg-config intltool gobject-introspection vala ];
1515 buildInputs = [ aspell gtk3 enchant isocodes ];
1616 propagatedBuildInputs = [ enchant ];
1717
pkgs/development/libraries/gtkspell/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}:
1+{stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}:
22
33stdenv.mkDerivation {
44 name = "gtkspell-2.0.16";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [aspell gtk2 enchant intltool];
1313
1414 meta = with stdenv.lib; {
pkgs/development/libraries/gtkspellmm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, pkgconfig
2+, pkg-config
33, gtk3, glib, glibmm, gtkmm3, gtkspell3
44}:
55
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 gtkspell3
1818 ];
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [
2222 gtk3 glib glibmm gtkmm3
2323 ];
pkgs/development/libraries/gts/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib, buildPackages }:
1+{ fetchurl, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }:
22
33
44stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [
16− pkgconfig
16+ pkg-config
1717 autoreconfHook
1818 glib # required to satisfy AM_PATH_GLIB_2_0
1919 ];
pkgs/development/libraries/gupnp-av/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, gobject-introspection
55, vala
66, gtk-doc
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 };
2424
2525 nativeBuildInputs = [
26− pkgconfig
26+ pkg-config
2727 gobject-introspection
2828 vala
2929 gtk-doc
pkgs/development/libraries/gupnp-dlna/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, gobject-introspection
55, vala
66, gtk-doc
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 };
2424
2525 nativeBuildInputs = [
26− pkgconfig
26+ pkg-config
2727 gobject-introspection
2828 vala
2929 gtk-doc
pkgs/development/libraries/gupnp-igd/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, fetchpatch
44, autoreconfHook
5−, pkgconfig
5+, pkg-config
66, gettext
77, gobject-introspection
88, gtk-doc
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 ];
3434
3535 nativeBuildInputs = [
36− pkgconfig
36+ pkg-config
3737 autoreconfHook
3838 gettext
3939 gobject-introspection
pkgs/development/libraries/gupnp/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchpatch
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, gobject-introspection
88, vala
99, gtk-doc
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
5353 nativeBuildInputs = [
5454 meson
5555 ninja
56− pkgconfig
56+ pkg-config
5757 gobject-introspection
5858 vala
5959 gtk-doc
pkgs/development/libraries/gusb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection
1+{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection
22, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
33, glib, systemd, libusb1, vala, hwdata
44}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 };
2121
2222 nativeBuildInputs = [
23− meson ninja pkgconfig gettext pythonEnv
23+ meson ninja pkg-config gettext pythonEnv
2424 gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
2525 gobject-introspection vala
2626 ];
pkgs/development/libraries/gvfs/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gettext
77, dbus
88, glib
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
5959 meson
6060 ninja
6161 python3
62− pkgconfig
62+ pkg-config
6363 gettext
6464 wrapGAppsHook
6565 libxml2
pkgs/development/libraries/hamlib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig,
1+{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config,
22 boost, libtool, perlPackages }:
33
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
14− tcl libusb-compat-0_1 pkgconfig boost libtool ];
14+ tcl libusb-compat-0_1 pkg-config boost libtool ];
1515
1616 configureFlags = [ "--with-perl-binding" "--with-python-binding"
1717 "--with-tcl-binding" "--with-rigmatrix" ];
pkgs/development/libraries/harfbuzz/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl
1+{ stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl
22, meson, ninja
33, gobject-introspection
44, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
5050 ninja
5151 gobject-introspection
5252 libintl
53− pkgconfig
53+ pkg-config
5454 python3
5555 gtk-doc
5656 docbook-xsl-nons
pkgs/development/libraries/hidapi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1
22, darwin }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1616
1717 buildInputs = [ ]
1818 ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
pkgs/development/libraries/hivex/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
1+{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
22, perlPackages, libxml2, libiconv }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 patches = [ ./hivex-syms.patch ];
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [
1717 autoreconfHook makeWrapper libxml2
1818 ]
pkgs/development/libraries/hwloc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl
1+{ stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
22, x11Support ? false, libX11 ? null, cairo ? null
33}:
44
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
2525 ];
2626
2727 # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
28− nativeBuildInputs = [ pkgconfig ];
28+ nativeBuildInputs = [ pkg-config ];
2929
3030 # Filter out `null' inputs. This allows users to `.override' the
3131 # derivation and set optional dependencies to `null'.
pkgs/development/libraries/hyena/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }:
1+{ stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }:
22
33stdenv.mkDerivation rec {
44 pname = "hyena";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [
1414 mono gtk-sharp-2_0
1515 ];
pkgs/development/libraries/hyperscan/default.nix+2−2
@@ -4,8 +4,8 @@
44, withStatic ? false # build only shared libs by default, build static+shared if true
55}:
66
7−# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
8−# pcap used only in examples, pkgconfig used only to check for pcre
7+# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs
8+# pcap used only in examples, pkg-config used only to check for pcre
99# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
1010# I not see any reason (for now) to backport 8.41.
1111
pkgs/development/libraries/igraph/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub,
2− pkgconfig, autoreconfHook,
2+ pkg-config, autoreconfHook,
33 flex, yacc, zlib, libxml2 }:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig autoreconfHook ];
16+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1717 buildInputs = [ flex yacc zlib libxml2 ];
1818
1919 # Normally, igraph wants us to call bootstrap.sh, which will call
pkgs/development/libraries/iksemel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
1+{ stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }:
22
33stdenv.mkDerivation rec {
44 pname = "iksemel";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ];
14+ nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ];
1515 buildInputs = [ gnutls ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/ilixi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }:
1+{ stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
22
33# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
44# Reflex, Wnn, NLS
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ directfb libsigcxx libxml2 fontconfig ];
1616
1717 configureFlags = [
pkgs/development/libraries/imlib2/default.nix+2−2
@@ -3,7 +3,7 @@
33, libjpeg, libtiff, giflib, libpng, libwebp
44# imlib2 can load images from ID3 tags.
55, libid3tag
6−, freetype , bzip2, pkgconfig
6+, freetype , bzip2, pkg-config
77, x11Support ? true, xlibsWrapper ? null
88}:
99
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 bzip2 freetype libid3tag
2525 ] ++ optional x11Support xlibsWrapper;
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828
2929 enableParallelBuilding = true;
3030
pkgs/development/libraries/indicator-application/gtk2.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, lib, file
2−, pkgconfig, autoconf
2+, pkg-config, autoconf
33, glib, dbus-glib, json-glib
44, gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }:
55
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig autoconf ];
17+ nativeBuildInputs = [ pkg-config autoconf ];
1818
1919 buildInputs = [
2020 glib dbus-glib json-glib
pkgs/development/libraries/indicator-application/gtk3.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchbzr
2−, pkgconfig, systemd, autoreconfHook
2+, pkg-config, systemd, autoreconfHook
33, glib, dbus-glib, json-glib
44, gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig autoreconfHook ];
18+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1919
2020 buildInputs = [
2121 glib dbus-glib json-glib systemd
pkgs/development/libraries/intel-media-sdk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11
22, libXau, libXdmcp, libpthreadstubs }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [
1717 libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs
1818 ];
pkgs/development/libraries/itk/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, makeWrapper
2−, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }:
2+, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }:
33
44stdenv.mkDerivation rec {
55 pname = "itk";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
3333
3434 postInstall = ''
35− wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin"
35+ wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
3636 '';
3737
3838 meta = {
pkgs/development/libraries/java/swt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
1+{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2
22, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
33, pango, gdk-pixbuf, glib
44}:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
3535
3636 sourceRoot = ".";
3737
38− nativeBuildInputs = [ unzip pkgconfig ];
38+ nativeBuildInputs = [ unzip pkg-config ];
3939 buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
4040
4141 NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) +
pkgs/development/libraries/jose/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
22, zlib, jansson, openssl
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1717 buildInputs = [ zlib jansson openssl ];
1818
1919 outputs = [ "out" "dev" "man" ];
pkgs/development/libraries/json-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext
1+{ stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext
22, gobject-introspection, fixDarwinDylibNames, gnome3
33}:
44
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 };
1515
1616 propagatedBuildInputs = [ glib ];
17− nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]
17+ nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
1818 ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
1919
2020 outputs = [ "out" "dev" ];
pkgs/development/libraries/jsonrpc-glib/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
1+{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
22stdenv.mkDerivation rec {
33 pname = "jsonrpc-glib";
44 version = "3.38.0";
55
66 outputs = [ "out" "dev" "devdoc" ];
77
8− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
8+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
99 buildInputs = [ glib json-glib ];
1010
1111 src = fetchurl {
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, cmake, pkgconfig }:
1+{ mkDerivation, lib, cmake, pkg-config }:
22
33mkDerivation {
44 name = "extra-cmake-modules";
@@ -9,7 +9,7 @@ mkDerivation {
99
1010 outputs = [ "out" ]; # this package has no runtime components
1111
12− propagatedBuildInputs = [ cmake pkgconfig ];
12+ propagatedBuildInputs = [ cmake pkg-config ];
1313
1414 setupHook = ./setup-hook.sh;
1515
pkgs/development/libraries/kerberos/heimdal.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
22, texinfo, perlPackages
33, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
44, CoreFoundation, Security, SystemConfiguration
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 patches = [ ./heimdal-make-missing-headers.patch ];
2222
23− nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ]
23+ nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ]
2424 ++ (with perlPackages; [ JSON ]);
2525 buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
2626 ++ [ db sqlite openssl libedit openldap pam]
pkgs/development/libraries/kerberos/krb5.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds
1+{ stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds
22, openssl, openldap, libedit, keyutils
33
44# Extra Arguments
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 "ac_cv_printf_positional=yes"
5050 ];
5151
52− nativeBuildInputs = [ pkgconfig perl ]
52+ nativeBuildInputs = [ pkg-config perl ]
5353 ++ optional (!libOnly) yacc
5454 # Provides the mig command used by the build scripts
5555 ++ optional stdenv.isDarwin bootstrap_cmds;
pkgs/development/libraries/keybinder/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3
1+{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3
22, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
33}:
44
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [
1919 autoconf automake libtool gnome3.gnome-common gtk-doc gtk2
2020 python pygtk lua gobject-introspection
pkgs/development/libraries/keybinder3/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
1+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3
22, gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r";
1414 };
1515
16− nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
16+ nativeBuildInputs = [ autoconf automake libtool pkg-config ];
1717 buildInputs = [
1818 gnome3.gnome-common gtk-doc gtk3
1919 libX11 libXext libXrender gobject-introspection
pkgs/development/libraries/kmsxx/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
22, withPython ? false, python }:
33
44stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515
1616 cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
1717
18− nativeBuildInputs = [ cmake pkgconfig ];
18+ nativeBuildInputs = [ cmake pkg-config ];
1919 buildInputs = [ libdrm python ];
2020
2121 meta = with stdenv.lib; {
pkgs/development/libraries/languagemachines/frog.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
33, libxml2, icu
44, languageMachines
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 version = release.version;
1414 src = fetchurl { inherit (release) url sha256;
1515 name = "frog-v${release.version}.tar.gz"; };
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
1818 libxml2 icu
1919 languageMachines.ticcutils
pkgs/development/libraries/languagemachines/frogdata.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, libtool, pkg-config, autoconf-archive
33}:
44
55let
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 version = release.version;
1212 src = fetchurl { inherit (release) url sha256;
1313 name = "frogdata-${release.version}.tar.gz"; };
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ automake autoconf libtool autoconf-archive
1616 ];
1717
pkgs/development/libraries/languagemachines/libfolia.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, libtool, pkg-config, autoconf-archive
33, libxml2, icu, bzip2, libtar
44, languageMachines }:
55
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 version = release.version;
1313 src = fetchurl { inherit (release) url sha256;
1414 name = "libfolia-${release.version}.tar.gz"; };
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
1717 preConfigure = "sh bootstrap.sh";
1818
pkgs/development/libraries/languagemachines/mbt.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
33, libxml2
44, languageMachines
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 version = release.version;
1414 src = fetchurl { inherit (release) url sha256;
1515 name = "mbt-${release.version}.tar.gz"; };
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
1818 libxml2
1919 languageMachines.ticcutils
pkgs/development/libraries/languagemachines/ticcutils.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, libtool, pkg-config, autoconf-archive
33, libxml2, zlib, bzip2, libtar }:
44
55let
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 version = release.version;
1212 src = fetchurl { inherit (release) url sha256;
1313 name = "ticcutils-${release.version}.tar.gz"; };
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ automake autoconf libtool autoconf-archive libxml2
1616 # optional:
1717 zlib bzip2 libtar
pkgs/development/libraries/languagemachines/timbl.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, libtool, pkg-config, autoconf-archive
33, libxml2, bzip2, libtar
44, languageMachines
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 version = release.version;
1414 src = fetchurl { inherit (release) url sha256;
1515 name = "timbl-${release.version}.tar.gz"; };
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
1818 libxml2
1919 languageMachines.ticcutils
pkgs/development/libraries/languagemachines/timblserver.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
33, libxml2
44, languageMachines
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 version = release.version;
1414 src = fetchurl { inherit (release) url sha256;
1515 name = "timblserver-${release.version}.tar.gz"; };
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
1818 libxml2
1919 languageMachines.ticcutils
pkgs/development/libraries/languagemachines/ucto.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, libtool, pkg-config, autoconf-archive
33, libxml2, icu, bzip2, libtar
44, languageMachines
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 version = release.version;
1414 src = fetchurl { inherit (release) url sha256;
1515 name = "ucto-${release.version}.tar.gz"; };
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ automake autoconf bzip2 libtool autoconf-archive
1818 icu libtar libxml2
1919 languageMachines.ticcutils
pkgs/development/libraries/languagemachines/uctodata.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, automake, autoconf, libtool, pkgconfig, autoconf-archive
2+, automake, autoconf, libtool, pkg-config, autoconf-archive
33 }:
44
55let
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 version = release.version;
1212 src = fetchurl { inherit (release) url sha256;
1313 name = "uctodata-${release.version}.tar.gz"; };
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ automake autoconf libtool autoconf-archive ];
1616 preConfigure = "sh bootstrap.sh";
1717
pkgs/development/libraries/lasem/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf
1+{ fetchurl, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf
22, libxml2, cairo, pango, gnome3 }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
15+ nativeBuildInputs = [ pkg-config intltool gobject-introspection ];
1616
1717 propagatedBuildInputs = [
1818 glib gdk-pixbuf libxml2 cairo pango
pkgs/development/libraries/lasso/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
1+{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }:
22
33stdenv.mkDerivation rec {
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
1616
1717 configurePhase = ''
pkgs/development/libraries/leptonica/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot
22, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ];
1616 enableParallelBuilding = true;
1717
pkgs/development/libraries/libabigail/default.nix+2−2
@@ -3,7 +3,7 @@
33, autoreconfHook
44, elfutils
55, libxml2
6−, pkgconfig
6+, pkg-config
77, strace
88, python3
99}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [
2323 autoreconfHook
24− pkgconfig
24+ pkg-config
2525 strace
2626 ];
2727
pkgs/development/libraries/libabw/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
1+{ stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }:
22
33stdenv.mkDerivation rec {
44 pname = "libabw";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
1616 '';
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ boost doxygen gperf librevenge libxml2 perl ];
2020
2121 meta = with stdenv.lib; {
pkgs/development/libraries/libaccounts-glib/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
2−, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
2+, libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
33
44stdenv.mkDerivation rec {
55 pname = "libaccounts-glib";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 gtk-doc
2727 meson
2828 ninja
29− pkgconfig
29+ pkg-config
3030 vala
3131 ];
3232
pkgs/development/libraries/libagar/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
1+{ stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc
22, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL
33, libsndfile, portaudio, libmysqlclient, fontconfig
44}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626
2727 outputs = [ "out" "devdoc" ];
2828
29− nativeBuildInputs = [ pkgconfig libtool gettext ];
29+ nativeBuildInputs = [ pkg-config libtool gettext ];
3030
3131 buildInputs = [
3232 bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc
pkgs/development/libraries/libao/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap
1+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap
22, CoreAudio, CoreServices, AudioUnit
33, usePulseAudio }:
44
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 lib.optionals stdenv.isLinux [ alsaLib libcap ] ++
2727 lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
2828
29− nativeBuildInputs = [ autoreconfHook pkgconfig ];
29+ nativeBuildInputs = [ autoreconfHook pkg-config ];
3030
3131 meta = with stdenv.lib; {
3232 longDescription = ''
pkgs/development/libraries/libaom/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }:
1+{ stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libaom";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 patches = [ ./outputs.patch ];
1414
1515 nativeBuildInputs = [
16− yasm perl cmake pkgconfig python3
16+ yasm perl cmake pkg-config python3
1717 ];
1818
1919 preConfigure = ''
pkgs/development/libraries/libaosd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango,
1+{ stdenv, fetchFromGitHub, pkg-config, cairo, pango,
22 libX11, libXcomposite, autoconf, automake }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a";
1313 };
1414
15− nativeBuildInputs = [ autoconf automake pkgconfig ];
15+ nativeBuildInputs = [ autoconf automake pkg-config ];
1616 buildInputs = [ cairo pango libX11 libXcomposite ];
1717 enableParallelBuilding = true;
1818
pkgs/development/libraries/libappindicator/default.nix+2−2
@@ -1,7 +1,7 @@
11# TODO: Resolve the issues with the Mono bindings.
22
33{ stdenv, fetchgit, lib
4−, pkgconfig, autoreconfHook
4+, pkg-config, autoreconfHook
55, glib, dbus-glib, gtkVersion ? "3"
66, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
77, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d";
2626 };
2727
28− nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ];
28+ nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ];
2929
3030 propagatedBuildInputs =
3131 if gtkVersion == "2"
pkgs/development/libraries/libarchive/default.nix+3−3
@@ -1,5 +1,5 @@
11{
2− fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
2+ fetchFromGitHub, stdenv, pkg-config, autoreconfHook,
33 acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
44
55 # Optional but increases closure only negligibly. Also, while libxml2
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
2323
2424 outputs = [ "out" "lib" "dev" ];
2525
26− nativeBuildInputs = [ pkgconfig autoreconfHook ];
26+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2727 buildInputs =
2828 stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils
2929 ++ [ zlib bzip2 openssl xz lzo zstd ]
3030 ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
3131 ++ stdenv.lib.optional xarSupport libxml2;
3232
33− # Without this, pkgconfig-based dependencies are unhappy
33+ # Without this, pkg-config-based dependencies are unhappy
3434 propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ];
3535
3636 configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2";
pkgs/development/libraries/libass/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, yasm
1+{ stdenv, fetchurl, pkg-config, yasm
22, freetype, fribidi, harfbuzz
33, encaSupport ? true, enca ? null # enca support
44, fontconfigSupport ? true, fontconfig ? null # fontconfig support
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 (mkFlag largeTilesSupport "large-tiles")
3232 ];
3333
34− nativeBuildInputs = [ pkgconfig yasm ];
34+ nativeBuildInputs = [ pkg-config yasm ];
3535
3636 buildInputs = [ freetype fribidi harfbuzz ]
3737 ++ optional encaSupport enca
pkgs/development/libraries/libast/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, pkgconfig }:
2+, pkg-config }:
33
44stdenv.mkDerivation rec {
55 pname = "libast";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 description = "Library of Assorted Spiffy Things";
pkgs/development/libraries/libaudclient/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }:
1+{ stdenv, fetchurl, pkg-config, glib, dbus-glib }:
22
33stdenv.mkDerivation rec {
44 name = "libaudclient-3.5-rc2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ glib dbus-glib ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libav/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash
1+{ stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash
22, mp3Support ? true, lame ? null
33, speexSupport ? true, speex ? null
44, theoraSupport ? true, libtheora ? null
@@ -81,7 +81,7 @@ let
8181 "--enable-cross-compile"
8282 ];
8383
84− nativeBuildInputs = [ pkgconfig perl ];
84+ nativeBuildInputs = [ pkg-config perl ];
8585 buildInputs = [ lame yasm zlib bzip2 SDL bash ]
8686 ++ [ perl ] # for install-man target
8787 ++ optional mp3Support lame
pkgs/development/libraries/libavc1394/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libraw1394 }:
1+{ stdenv, fetchurl, pkg-config, libraw1394 }:
22
33stdenv.mkDerivation rec {
44 name = "libavc1394-0.5.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 propagatedBuildInputs = [ libraw1394 ];
1313
1414 meta = {
pkgs/development/libraries/libblockdev/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc
1+{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
22, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
33, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
44, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 '';
3030
3131 nativeBuildInputs = [
32− autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43
32+ autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43
3333 python3 gobject-introspection autoconf-archive makeWrapper
3434 ];
3535
pkgs/development/libraries/libbluray/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration
1+{ stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
22, withJava ? false, jdk ? null, ant ? null
33, withAACS ? false, libaacs ? null
44, withBDplus ? false, libbdplus ? null
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 patches = optional withJava ./BDJ-JARFILE-path.patch;
3030
31− nativeBuildInputs = [ pkgconfig autoreconfHook ]
31+ nativeBuildInputs = [ pkg-config autoreconfHook ]
3232 ++ optionals withJava [ ant ]
3333 ;
3434
pkgs/development/libraries/libbytesize/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
22, gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl
33, python3, pcre2, gmp, mpfr
44}:
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
1818
1919 outputs = [ "out" "dev" "devdoc" ];
2020
21− nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ];
21+ nativeBuildInputs = [ autoreconfHook pkg-config gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ];
2222
2323 buildInputs = [ pcre2 gmp mpfr ];
2424
pkgs/development/libraries/libcaca/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2
1+{ stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2
22, x11Support ? !stdenv.isDarwin, libX11, libXext
33}:
44
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 enableParallelBuilding = true;
2525
26− propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
26+ propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ]
2727 ++ stdenv.lib.optionals x11Support [ libX11 libXext ];
2828
2929 postInstall = ''
pkgs/development/libraries/libcacard/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, nss }:
1+{ stdenv, fetchurl, pkg-config, glib, nss }:
22
33stdenv.mkDerivation rec {
44 pname = "libcacard";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ glib nss ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libcanberra/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
1+{ stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool
22, gtk ? null
33, libpulseaudio, gst_all_1, libvorbis, libcap
44, CoreServices
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig libtool ];
15+ nativeBuildInputs = [ pkg-config libtool ];
1616 buildInputs = [
1717 libpulseaudio libvorbis gtk
1818 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
pkgs/development/libraries/libcangjie/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
1+{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
22
33stdenv.mkDerivation rec {
44 pname = "libcangjie";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ automake autoconf libtool m4 sqlite ];
1515
1616 configureScript = "./autogen.sh";
pkgs/development/libraries/libcdio-paranoia/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
1+{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config,
22 libiconv, IOKit, DiskArbitration}:
33
44stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ libcdio ] ++
1616 stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
1717
pkgs/development/libraries/libcdio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }:
1+{ stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
22
33stdenv.mkDerivation rec {
44 name = "libcdio-2.1.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 patchShebangs .
1313 '';
1414
15− nativeBuildInputs = [ pkgconfig help2man ];
15+ nativeBuildInputs = [ pkg-config help2man ];
1616 buildInputs = [ libcddb ncurses ]
1717 ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
1818
pkgs/development/libraries/libcdr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
1+{ stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
22
33stdenv.mkDerivation rec {
44 name = "libcdr-0.1.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
1616
pkgs/development/libraries/libcec/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }:
1+{ stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
22
33let version = "4.0.7"; in
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig cmake ];
14+ nativeBuildInputs = [ pkg-config cmake ];
1515 buildInputs = [ udev libcec_platform ] ++
1616 stdenv.lib.optional (libraspberrypi != null) libraspberrypi;
1717
pkgs/development/libraries/libchamplain/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
1+{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3
22, clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 outputs = [ "out" "dev" "devdoc" ];
1414
15− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
15+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
1616
1717 buildInputs = [ sqlite libsoup ];
1818
pkgs/development/libraries/libchop/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl, stdenv, zlib, bzip2, libgcrypt
22, gdbm, gperf, tdb, gnutls, db, libuuid
3−, lzo, pkgconfig, guile, rpcsvc-proto, libtirpc
3+, lzo, pkg-config, guile, rpcsvc-proto, libtirpc
44}:
55
66stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ];
1515
16− nativeBuildInputs = [ pkgconfig gperf rpcsvc-proto ];
16+ nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ];
1717
1818 NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
1919 NIX_LDFLAGS = [ "-ltirpc" ];
pkgs/development/libraries/libcloudproviders/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
1+{ stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
22
33# TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 "-Denable-gtk-doc=true"
1818 ];
1919
20− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ];
20+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ];
2121
2222 buildInputs = [ glib ];
2323
pkgs/development/libraries/libclxclient/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
1+{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libclxclient";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include";
1717
pkgs/development/libraries/libcmis/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }:
1+{ stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }:
22
33stdenv.mkDerivation rec {
44 pname = "libcmis";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ];
1515 buildInputs = [ boost libxml2 curl cppunit ];
1616
1717 configureFlags = [
pkgs/development/libraries/libco-canonical/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig }:
1+{ stdenv, fetchFromGitHub, pkg-config }:
22
33with stdenv.lib;
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 makeFlags = [ "PREFIX=${placeholder "out"}" ];
1919
pkgs/development/libraries/libcouchbase/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}:
22
33stdenv.mkDerivation rec {
44 pname = "libcouchbase";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
1515
16− nativeBuildInputs = [ cmake pkgconfig ];
16+ nativeBuildInputs = [ cmake pkg-config ];
1717 buildInputs = [ libevent openssl ];
1818
1919 # Running tests in parallel does not work
pkgs/development/libraries/libcryptui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
22
33stdenv.mkDerivation rec {
44 pname = "libcryptui";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch
1414 ];
1515
16− nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
16+ nativeBuildInputs = [ pkg-config intltool autoreconfHook ];
1717 buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ];
1818 propagatedBuildInputs = [ dbus-glib ];
1919
pkgs/development/libraries/libdazzle/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2
1+{ stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }:
33
44stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
1414 };
1515
16− nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
16+ nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
1717 buildInputs = [ glib gtk3 ];
1818
1919 mesonFlags = [
pkgs/development/libraries/libdbusmenu/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, lib, file
2−, pkgconfig, intltool
2+, pkg-config, intltool
33, glib, dbus-glib, json-glib
44, gobject-introspection, vala
55, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
1919 };
2020
21− nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ];
21+ nativeBuildInputs = [ vala pkg-config intltool gobject-introspection ];
2222
2323 buildInputs = [
2424 glib dbus-glib json-glib
pkgs/development/libraries/libde265/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
22
33stdenv.mkDerivation rec {
44 version = "1.0.8";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515
1616 enableParallelBuilding = true;
1717
pkgs/development/libraries/libdevil/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL
2−, libX11, pkgconfig, OpenGL
2+, libX11, pkg-config, OpenGL
33}:
44
55stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ]
1818 ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020
2121 configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
2222
pkgs/development/libraries/libdigidocpp/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
2−, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
2+, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
33
44stdenv.mkDerivation rec {
55 version = "3.14.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l";
1111 };
1212
13− nativeBuildInputs = [ cmake pkgconfig xxd ];
13+ nativeBuildInputs = [ cmake pkg-config xxd ];
1414
1515 buildInputs = [
1616 libdigidoc minizip pcsclite opensc openssl xercesc
pkgs/development/libraries/libdiscid/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, darwin }:
1+{ stdenv, fetchurl, cmake, pkg-config, darwin }:
22
33stdenv.mkDerivation rec {
44 pname = "libdiscid";
55 version = "0.6.2";
66
7− nativeBuildInputs = [ cmake pkgconfig ];
7+ nativeBuildInputs = [ cmake pkg-config ];
88
99 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
1010
pkgs/development/libraries/libdmtx/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig }:
1+{ stdenv, fetchurl, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "libdmtx-0.7.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212
1313 meta = {
1414 description = "An open source software for reading and writing Data Matrix barcodes";
pkgs/development/libraries/libdrm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
1+{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess
22, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 outputs = [ "out" "dev" "bin" ];
1515
16− nativeBuildInputs = [ pkgconfig meson ninja ];
16+ nativeBuildInputs = [ pkg-config meson ninja ];
1717 buildInputs = [ libpthreadstubs libpciaccess ]
1818 ++ lib.optional withValgrind valgrind-light;
1919
pkgs/development/libraries/libdvdnav/4.2.1.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, libdvdread}:
1+{stdenv, fetchurl, pkg-config, libdvdread}:
22
33stdenv.mkDerivation {
44 name = "libdvdnav-4.2.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [libdvdread];
1313
1414 configureScript = "./configure2"; # wtf?
pkgs/development/libraries/libdvdnav/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, libdvdread}:
1+{stdenv, fetchurl, pkg-config, libdvdread}:
22
33stdenv.mkDerivation rec {
44 pname = "libdvdnav";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [libdvdread];
1414
1515 meta = {
pkgs/development/libraries/libe-book/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu
1+{ stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu
22, cppunit, zlib, liblangtag
33}:
44
@@ -13,7 +13,7 @@ let
1313 sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [
1818 gperf librevenge libxml2 boost icu cppunit zlib liblangtag
1919 ];
pkgs/development/libraries/libebml/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libebml";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515
1616 cmakeFlags = [
1717 "-DBUILD_SHARED_LIBS=YES"
pkgs/development/libraries/libee/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libestr }:
1+{ stdenv, fetchurl, pkg-config, libestr }:
22stdenv.mkDerivation {
33 name = "libee-0.4.1";
44
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0";
88 };
99
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [ libestr];
1212
1313 meta = {
pkgs/development/libraries/libepc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
22
33let
44 avahiWithGtk = avahi.override { gtk3Support = true; };
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [
17− pkgconfig
17+ pkg-config
1818 intltool
1919 gtk-doc
2020 ];
pkgs/development/libraries/libevdevplus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libevdevplus";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515
1616 meta = with stdenv.lib; {
1717 inherit (src.meta) homepage;
pkgs/development/libraries/libewf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }:
1+{ fetchurl, stdenv, zlib, openssl, libuuid, pkg-config }:
22
33stdenv.mkDerivation rec {
44 version = "20201129";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ zlib openssl libuuid ];
1414
1515 meta = {
pkgs/development/libraries/libextractor/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl, stdenv, substituteAll
22, libtool, gettext, zlib, bzip2, flac, libvorbis
3−, exiv2, libgsf, rpm, pkgconfig, fetchpatch
3+, exiv2, libgsf, rpm, pkg-config, fetchpatch
44, gstreamerSupport ? true, gst_all_1 ? null
55# ^ Needed e.g. for proper id3 and FLAC support.
66# Set to `false` to decrease package closure size by about 87 MB (53%).
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
6161 buildInputs =
6262 [ libtool gettext zlib bzip2 flac libvorbis exiv2
6363 libgsf rpm
64− pkgconfig
64+ pkg-config
6565 ] ++ stdenv.lib.optionals gstreamerSupport
6666 ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
6767 ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ]
pkgs/development/libraries/libfakekey/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }:
1+{ stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }:
22
33stdenv.mkDerivation rec {
44 pname = "libfakekey";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libX11 libXi libXtst xorgproto ];
1414 NIX_LDFLAGS = "-lX11";
1515
pkgs/development/libraries/libfido2/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, fetchpatch
44, cmake
5−, pkgconfig
5+, pkg-config
66, hidapi
77, libcbor
88, openssl
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r";
1818 };
1919
20− nativeBuildInputs = [ cmake pkgconfig ];
20+ nativeBuildInputs = [ cmake pkg-config ];
2121
2222 buildInputs = [ hidapi libcbor openssl ]
2323 ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
pkgs/development/libraries/libfilezilla/default.nix+2−2
@@ -4,7 +4,7 @@
44, gettext
55, gnutls
66, nettle
7−, pkgconfig
7+, pkg-config
88, libiconv
99, ApplicationServices
1010}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv";
1919 };
2020
21− nativeBuildInputs = [ autoreconfHook pkgconfig ];
21+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2222
2323 buildInputs = [ gettext gnutls nettle ]
2424 ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
pkgs/development/libraries/libfishsound/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }:
1+{ stdenv, fetchurl, libvorbis, speex, flac, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "libfishsound-1.0.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 propagatedBuildInputs = [ libvorbis speex flac ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 homepage = "https://xiph.org/fishsound/";
pkgs/development/libraries/libfive/default.nix+2−2
@@ -4,7 +4,7 @@
44, fetchFromGitHub
55, cmake
66, ninja
7−, pkgconfig
7+, pkg-config
88, eigen
99, zlib
1010, libpng
@@ -23,7 +23,7 @@ mkDerivation {
2323 sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg";
2424 };
2525
26− nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ];
26+ nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
2727 buildInputs = [ eigen zlib libpng boost guile ];
2828
2929 # Link "Studio" binary to "libfive-studio" to be more obvious:
pkgs/development/libraries/libfixposix/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libfixposix";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515
1616 meta = with stdenv.lib; {
1717 homepage = "https://github.com/sionescu/libfixposix";
pkgs/development/libraries/libfm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala
1+{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala
22, extraOnly ? false
33, withGtk3 ? false, gtk2, gtk3 }:
44let
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
1717 };
1818
19− nativeBuildInputs = [ vala pkgconfig intltool ];
19+ nativeBuildInputs = [ vala pkg-config intltool ];
2020 buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache;
2121
2222 configureFlags = [
pkgs/development/libraries/libfprint/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchFromGitLab
3−, pkgconfig
3+, pkg-config
44, meson
55, ninja
66, gusb
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 };
2929
3030 nativeBuildInputs = [
31− pkgconfig
31+ pkg-config
3232 meson
3333 ninja
3434 gtk-doc
pkgs/development/libraries/libfreefare/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libnfc, openssl
1+{ stdenv, fetchurl, pkg-config, libnfc, openssl
22, libobjc ? null }:
33
44stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc;
1515
1616 meta = with stdenv.lib; {
pkgs/development/libraries/libfsm/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 runHook postInstall
2929 '';
3030
31− # fix up multi-output install. we also have to fix the pkgconfig libdir
31+ # fix up multi-output install. we also have to fix the pkg-config libdir
3232 # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in
3333 # our case; libdir should really be set to the $lib output.
3434 postInstall = ''
pkgs/development/libraries/libftdi/1.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse
1+{ stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse
22, cppSupport ? true, boost ? null
33, pythonSupport ? true, python3 ? null, swig ? null
44, docSupport ? true, doxygen ? null
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc";
1717 };
1818
19− nativeBuildInputs = [ cmake pkgconfig ];
19+ nativeBuildInputs = [ cmake pkg-config ];
2020 buildInputs = with stdenv.lib; [ libconfuse ]
2121 ++ optionals cppSupport [ boost ]
2222 ++ optionals pythonSupport [ python3 swig ]
pkgs/development/libraries/libgaminggear/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, gettext
1+{ stdenv, fetchurl, cmake, pkg-config, gettext
22, gtk2, libcanberra, libnotify, pcre, sqlite, xorg
33, harfbuzz
44}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 outputs = [ "dev" "out" "bin" ];
1616
17− nativeBuildInputs = [ cmake pkgconfig gettext ];
17+ nativeBuildInputs = [ cmake pkg-config gettext ];
1818
1919 propagatedBuildInputs = [
2020 gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs
pkgs/development/libraries/libgdamm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3
1+{ stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3
22, mysqlSupport ? false
33, postgresSupport ? false }:
44
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
1717 sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ glibmm libxml2 ];
2222 propagatedBuildInputs = [ gda ];
2323
pkgs/development/libraries/libgdata/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, meson
55, ninja
66, nixosTests
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 gobject-introspection
4040 meson
4141 ninja
42− pkgconfig
42+ pkg-config
4343 vala
4444 ];
4545
pkgs/development/libraries/libgdiplus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig
1+{ stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig
22, libtiff, giflib, libjpeg, libpng
33, libXrender, libexif, autoreconfHook, fetchpatch }:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 hardeningDisable = [ "format" ];
2121
22− nativeBuildInputs = [ autoreconfHook pkgconfig ];
22+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2323
2424 configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}";
2525
pkgs/development/libraries/libgee/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }:
1+{ stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libgee";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 doCheck = true;
1515
16− nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ];
16+ nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ];
1717 buildInputs = [ glib ];
1818
1919 PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
pkgs/development/libraries/libgepub/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3
1+{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3
22, webkitgtk, libsoup, libxml2, libarchive }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 doCheck = true;
1414
15− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
15+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
1616 buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];
1717
1818 passthru = {
pkgs/development/libraries/libgig/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
1+{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }:
22
33stdenv.mkDerivation rec {
44 pname = "libgig";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn";
1010 };
1111
12− nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
12+ nativeBuildInputs = [ autoconf automake libtool pkg-config ];
1313
1414 buildInputs = [ libsndfile libuuid ];
1515
pkgs/development/libraries/libgit2-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2
1+{ stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2
22, gtk-doc, gobject-introspection, libgit2, glib, python3 }:
33
44stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 };
2626
2727 nativeBuildInputs = [
28− meson ninja pkgconfig vala gtk-doc gobject-introspection
28+ meson ninja pkg-config vala gtk-doc gobject-introspection
2929 ];
3030
3131 propagatedBuildInputs = [
pkgs/development/libraries/libgksu/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
1+{ stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3,
22 libstartup_notification, libgtop, perlPackages,
33 autoreconfHook, intltool, docbook_xsl, xauth
44}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [
16− pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook
16+ pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook
1717 ];
1818
1919 buildInputs = [
pkgs/development/libraries/libglvnd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }:
1+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }:
22
33stdenv.mkDerivation rec {
44 pname = "libglvnd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];
1515 buildInputs = [ libX11 libXext xorgproto ];
1616
1717 postPatch = lib.optionalString stdenv.isDarwin ''
pkgs/development/libraries/libgnome-keyring/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }:
1+{ stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }:
22
33stdenv.mkDerivation rec {
44 pname = "libgnome-keyring";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 outputs = [ "out" "dev" ];
1313
1414 propagatedBuildInputs = [ glib dbus libgcrypt ];
15− nativeBuildInputs = [ pkgconfig intltool ];
15+ nativeBuildInputs = [ pkg-config intltool ];
1616
1717 meta = {
1818 inherit (glib.meta) platforms maintainers;
pkgs/development/libraries/libgnomekbd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libgnomekbd";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [
1919 file
2020 intltool
21− pkgconfig
21+ pkg-config
2222 wrapGAppsHook
2323 ];
2424
pkgs/development/libraries/libgnurl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls,
1+{ stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls,
22 libidn2, libunistring, nghttp2 }:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi";
1111 };
1212
13− nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
13+ nativeBuildInputs = [ libtool groff perl pkg-config python2 ];
1414
1515 buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
1616
pkgs/development/libraries/libgphoto2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
22, libusb1
33, libtool
44, libexif
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [
2222 autoreconfHook
23− pkgconfig
23+ pkg-config
2424 gettext
2525 libtool
2626 ];
pkgs/development/libraries/libgpiod/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod
1+{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod
22, enable-tools ? true
33, enablePython ? false, python3, ncurses }:
44
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
2121 nativeBuildInputs = [
2222 autoconf-archive
23− pkgconfig
23+ pkg-config
2424 autoreconfHook
2525 ];
2626
pkgs/development/libraries/libgringotts/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
1+{ stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }:
22
33stdenv.mkDerivation rec {
44 pname = "libgringotts";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ zlib bzip2 libmcrypt libmhash ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libgrss/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
22
33let
44 version = "0.7.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
17+ nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
1818 buildInputs = [ glib libxml2 libsoup ];
1919
2020 configureFlags = [
pkgs/development/libraries/libgsf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
1+{ fetchurl, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2
22, perl, gdk-pixbuf, libiconv, libintl, gnome3 }:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig intltool libintl ];
13+ nativeBuildInputs = [ pkg-config intltool libintl ];
1414
1515 buildInputs = [ gettext bzip2 zlib ];
1616 checkInputs = [ perl ];
pkgs/development/libraries/libgtop/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, glib
4−, pkgconfig
4+, pkg-config
55, perl
66, gettext
77, gobject-introspection
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 };
2020
2121 nativeBuildInputs = [
22− pkgconfig
22+ pkg-config
2323 gtk-doc
2424 perl
2525 gettext
pkgs/development/libraries/libgudev/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, udev
55, glib
66, gobject-introspection
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
1919 };
2020
21− nativeBuildInputs = [ pkgconfig gobject-introspection ];
21+ nativeBuildInputs = [ pkg-config gobject-introspection ];
2222 buildInputs = [ udev glib ];
2323
2424 # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
pkgs/development/libraries/libguestfs/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
1+{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
22, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
33, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
44, gmp, readline, file, numactl, libapparmor, jansson
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058";
2020 };
2121
22− nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
22+ nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
2323 buildInputs = [
2424 ncurses cpio gperf jansson
2525 cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
pkgs/development/libraries/libgweather/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup
1+{ stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy";
1313 };
1414
15− nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
15+ nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
1616 buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ];
1717
1818 postPatch = ''
pkgs/development/libraries/libgxps/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo
1+{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo
22, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";
1212 };
1313
14− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
14+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
1515 buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ];
1616 propagatedBuildInputs = [ libarchive ];
1717
pkgs/development/libraries/libhandy/0.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
1+{ stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43
33, gtk3, gnome3
44, dbus, xvfb_run, libxml2
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 };
2222
2323 nativeBuildInputs = [
24− meson ninja pkgconfig gobject-introspection vala libxml2
24+ meson ninja pkg-config gobject-introspection vala libxml2
2525 gtk-doc docbook_xsl docbook_xml_dtd_43
2626 ];
2727 buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ];
pkgs/development/libraries/libhandy/default.nix+3−3
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, gobject-introspection
77, vala
88, gtk-doc
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 libxml2
4242 meson
4343 ninja
44− pkgconfig
44+ pkg-config
4545 vala
4646 ];
4747
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
6565 "-Dgtk_doc=true"
6666 ];
6767
68− # Uses define_variable in pkgconfig, but we still need it to use the glade output
68+ # Uses define_variable in pkg-config, but we still need it to use the glade output
6969 PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
7070 PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
7171
pkgs/development/libraries/libheif/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng,
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng,
22 libjpeg, libaom }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz";
1515 };
1616
17− nativeBuildInputs = [ autoreconfHook pkgconfig ];
17+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1818 buildInputs = [ libde265 x265 libpng libjpeg libaom ];
1919 # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config
2020
pkgs/development/libraries/libhttpseverywhere/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch
1+{ stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
22, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
33
44let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
1212 sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
1313 };
1414
15− nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ];
15+ nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
1616 buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
1717
1818 # Fixes build with vala >=0.42
pkgs/development/libraries/libical/default.nix+2−2
@@ -9,7 +9,7 @@
99, libxml2
1010, ninja
1111, perl
12−, pkgconfig
12+, pkg-config
1313, libical
1414, python3
1515, tzdata
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 cmake
3838 ninja
3939 perl
40− pkgconfig
40+ pkg-config
4141 # Docs building fails:
4242 # https://github.com/NixOS/nixpkgs/pull/67204
4343 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
pkgs/development/libraries/libiec61883/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libraw1394 }:
1+{ stdenv, fetchurl, pkg-config, libraw1394 }:
22
33stdenv.mkDerivation rec {
44 version = "1.2.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 propagatedBuildInputs = [ libraw1394 ];
1616
pkgs/development/libraries/libimobiledevice/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls
1+{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls
22, libgcrypt, libtasn1, glib, libplist, libusbmuxd }:
33
44stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 autoconf
1919 automake
2020 libtool
21− pkgconfig
21+ pkg-config
2222 ];
2323 propagatedBuildInputs = [
2424 glib
pkgs/development/libraries/libindicator/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, lib, file
2−, pkgconfig
2+, pkg-config
33, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
44
55with lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919
2020 buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ];
2121
pkgs/development/libraries/libinfinity/default.nix+2−2
@@ -1,6 +1,6 @@
11{ gtkWidgets ? false # build GTK widgets for libinfinity
22, avahiSupport ? false # build support for Avahi in libinfinity
3−, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
3+, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl
44, gobject-introspection
55, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss
66, libintl }:
@@ -21,7 +21,7 @@ let
2121
2222 outputs = [ "bin" "out" "dev" "man" "devdoc" ];
2323
24− nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
24+ nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
2525 buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ]
2626 ++ stdenv.lib.optional gtkWidgets gtk3
2727 ++ stdenv.lib.optional avahiSupport avahi;
pkgs/development/libraries/libinput/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja
1+{ stdenv, fetchFromGitLab, pkg-config, meson, ninja
22, libevdev, mtdev, udev, libwacom
33, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
44, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 "--libexecdir=${placeholder "bin"}/libexec"
4848 ];
4949
50− nativeBuildInputs = [ pkgconfig meson ninja ]
50+ nativeBuildInputs = [ pkg-config meson ninja ]
5151 ++ optionals documentationSupport [ doxygen graphviz sphinx-build ];
5252
5353 buildInputs = [
pkgs/development/libraries/libiodbc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, stdenv, fetchurl, pkgconfig, gtk2, Carbon
1+{ config, stdenv, fetchurl, pkg-config, gtk2, Carbon
22, useGTK ? config.libiodbc.gtk or false }:
33
44stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]
1414 ++ stdenv.lib.optional stdenv.isDarwin Carbon;
1515
pkgs/development/libraries/libirecovery/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig
1+{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config
22, libusb1
33, readline
44}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 autoconf
2121 automake
2222 libtool
23− pkgconfig
23+ pkg-config
2424 ];
2525
2626 buildInputs = [
pkgs/development/libraries/libite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }:
22
33stdenv.mkDerivation rec {
44 pname = "libite";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ libconfuse ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/libivykis/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }:
22
33stdenv.mkDerivation rec {
44 pname = "libivykis";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0abi0rc3wnncvr68hy6rmzp96x6napd7fs1mff20dr8lb0jyvy3f";
1111 };
1212
13− nativeBuildInputs = [ autoreconfHook pkgconfig ];
13+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1414 buildInputs = [ file protobufc ];
1515
1616 meta = with stdenv.lib; {
pkgs/development/libraries/liblangtag/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
2−, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip
2+, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip
33}:
44
55stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737
3838 buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
3939 unzip ];
40− nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ];
40+ nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ];
4141
4242 meta = {
4343 inherit version;
pkgs/development/libraries/liblastfm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake
1+{ stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake
22, fftwSinglePrec, libsamplerate, qtbase
33, darwin }:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l";
2020 })];
2121
22− nativeBuildInputs = [ pkgconfig which cmake ];
22+ nativeBuildInputs = [ pkg-config which cmake ];
2323 buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
2424 ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
2525
pkgs/development/libraries/liblastfmSF/default.nix+2−2
@@ -1,9 +1,9 @@
1−{ stdenv, fetchurl, pkgconfig, curl, openssl }:
1+{ stdenv, fetchurl, pkg-config, curl, openssl }:
22
33stdenv.mkDerivation {
44 name = "liblastfm-SF-0.5";
55
6− nativeBuildInputs = [ pkgconfig ];
6+ nativeBuildInputs = [ pkg-config ];
77
88 propagatedBuildInputs = [ curl openssl ];
99
pkgs/development/libraries/liblcf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }:
22
33stdenv.mkDerivation rec {
44 pname = "liblcf";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 propagatedBuildInputs = [ expat icu ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/liblinphone/default.nix+2−2
@@ -34,7 +34,7 @@
3434, openldap
3535, ortp
3636, pango
37−, pkgconfig
37+, pkg-config
3838, python
3939, readline
4040, soci
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
111111 graphviz
112112 intltool
113113 makeWrapper
114− pkgconfig
114+ pkg-config
115115 ];
116116
117117 # Some grammar files needed to be copied too from some dependencies. I suppose
pkgs/development/libraries/liblogging/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, systemd ? null
33}:
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ systemd ];
1515
1616 configureFlags = [
pkgs/development/libraries/liblognorm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }:
1+{ stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }:
22
33stdenv.mkDerivation rec {
44 name = "liblognorm-2.0.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ libestr json_c pcre fastJson ];
1313
1414 configureFlags = [ "--enable-regexp" ];
pkgs/development/libraries/liblouis/default.nix+2−2
@@ -1,7 +1,7 @@
11{ fetchFromGitHub
22, stdenv
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, gettext
66, python3
77, texinfo
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 nativeBuildInputs = [
2727 autoreconfHook
28− pkgconfig
28+ pkg-config
2929 gettext
3030 python3
3131 # Docs, man, info
pkgs/development/libraries/liblqr-1/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib }:
1+{ stdenv, fetchurl, pkg-config, glib }:
22
33stdenv.mkDerivation rec {
44 name = "liblqr-1-0.4.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 propagatedBuildInputs = [ glib ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/libraries/liblscp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }:
1+{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "liblscp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k";
1010 };
1111
12− nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
12+ nativeBuildInputs = [ autoconf automake libtool pkg-config ];
1313
1414 preConfigure = "make -f Makefile.git";
1515
pkgs/development/libraries/libmanette/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, ninja
44, meson
5−, pkgconfig
5+, pkg-config
66, vala
77, gobject-introspection
88, gtk-doc
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 nativeBuildInputs = [
2929 meson
3030 ninja
31− pkgconfig
31+ pkg-config
3232 vala
3333 gobject-introspection
3434 gtk-doc
pkgs/development/libraries/libmatheval/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }:
1+{ stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 version = "1.1.11";
55 pname = "libmatheval";
66
7− nativeBuildInputs = [ pkgconfig autoconf flex ];
7+ nativeBuildInputs = [ pkg-config autoconf flex ];
88 buildInputs = [ guile ];
99
1010 src = fetchurl {
pkgs/development/libraries/libmatroska/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, fetchFromGitHub, cmake, pkg-config
22, libebml }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 buildInputs = [ libebml ];
1818
pkgs/development/libraries/libmediaart/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
1+{ stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "libmediaart";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d";
1212 };
1313
14− nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
14+ nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
1515 buildInputs = [ glib gdk-pixbuf ];
1616
1717 patches = [
pkgs/development/libraries/libmediainfo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
22
33stdenv.mkDerivation rec {
44 version = "20.09";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h";
99 };
1010
11− nativeBuildInputs = [ autoreconfHook pkgconfig ];
11+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1212 buildInputs = [ libzen zlib ];
1313
1414 sourceRoot = "./MediaInfoLib/Project/GNU/Library/";
pkgs/development/libraries/libmicrodns/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66}:
77
88stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 nativeBuildInputs = [
2020 meson
2121 ninja
22− pkgconfig
22+ pkg-config
2323 ];
2424
2525 meta = with stdenv.lib; {
pkgs/development/libraries/libmicrohttpd/generic.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }:
1+{ stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
22
33stdenv.mkDerivation rec {
44 pname = "libmicrohttpd";
55 inherit version src;
66
77 outputs = [ "out" "dev" "devdoc" "info" ];
8− nativeBuildInputs = [ pkgconfig ];
8+ nativeBuildInputs = [ pkg-config ];
99 buildInputs = [ libgcrypt curl gnutls libiconv libintl ];
1010
1111 preCheck = ''
pkgs/development/libraries/libmms/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, pkgconfig }:
1+{ stdenv, fetchurl, glib, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "libmms-0.6.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ glib ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 description = "Library for downloading (streaming) media files using the mmst and mmsh protocols";
pkgs/development/libraries/libmodule/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, cmake, pkgconfig }:
2+, cmake, pkg-config }:
33
44stdenv.mkDerivation rec {
55 pname = "libmodule";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [
1616 cmake
17− pkgconfig
17+ pkg-config
1818 ];
1919
2020 meta = with stdenv.lib; {
pkgs/development/libraries/libmongo-client/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }:
22
33stdenv.mkDerivation rec {
44 name = "libmongo-client-0.1.8";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0";
1111 };
1212
13− nativeBuildInputs = [ autoreconfHook pkgconfig ];
13+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1414 buildInputs = [ ];
1515 propagatedBuildInputs = [ glib ];
1616
pkgs/development/libraries/libmrss/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, curl, libnxml, pkgconfig}:
1+{stdenv, fetchurl, curl, libnxml, pkg-config}:
22
33stdenv.mkDerivation {
44 name = "libmrss-0.19.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 propagatedBuildInputs = [ curl libnxml ];
1313
1414 meta = {
pkgs/development/libraries/libmtp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig
1+{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config
22, libusb1
33, libiconv
44}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 automake
2222 gettext
2323 libtool
24− pkgconfig
24+ pkg-config
2525 ];
2626
2727 buildInputs = [
pkgs/development/libraries/libmwaw/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
1+{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
22let
33 s = # Generated upstream information
44 rec {
@@ -10,7 +10,7 @@ let
1010 sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [
1515 boost cppunit zlib libwpg libwpd librevenge
1616 ];
pkgs/development/libraries/libmx/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, libtool, pkgconfig, automake, autoconf, intltool
2+, libtool, pkg-config, automake, autoconf, intltool
33, glib, gobject-introspection, gtk2, gtk-doc
44, clutter, clutter-gtk
55}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
3232 configureScript = "sh autogen.sh";
3333
34− nativeBuildInputs = [ pkgconfig ];
34+ nativeBuildInputs = [ pkg-config ];
3535 buildInputs = [
3636 automake autoconf libtool
3737 intltool
pkgs/development/libraries/libmypaint/default.nix+2−2
@@ -6,7 +6,7 @@
66, intltool
77, json_c
88, libtool
9−, pkgconfig
9+, pkg-config
1010, python3
1111}:
1212
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 automake
2929 intltool
3030 libtool
31− pkgconfig
31+ pkg-config
3232 python3
3333 ];
3434
pkgs/development/libraries/libndctl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook
2−, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
2+, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
33, json_c, kmod, which, util-linux, udev, keyutils
44}:
55
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 outputs = [ "out" "lib" "man" "dev" ];
1818
1919 nativeBuildInputs =
20− [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
20+ [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt
2121 which
2222 ];
2323
pkgs/development/libraries/libnetfilter_acct/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libmnl }:
1+{ stdenv, fetchurl, pkg-config, libmnl }:
22
33stdenv.mkDerivation rec {
44 version = "1.0.3";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libmnl ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libnetfilter_conntrack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
1+{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
22
33stdenv.mkDerivation rec {
44 pname = "libnetfilter_conntrack";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 buildInputs = [ libmnl ];
1313 propagatedBuildInputs = [ libnfnetlink ];
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 meta = with stdenv.lib; {
1717 description = "Userspace library providing an API to the in-kernel connection tracking state table";
pkgs/development/libraries/libnetfilter_cthelper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libmnl }:
1+{ stdenv, fetchurl, pkg-config, libmnl }:
22
33stdenv.mkDerivation rec {
44 pname = "libnetfilter_cthelper";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libmnl ];
1414
1515 meta = {
pkgs/development/libraries/libnetfilter_cttimeout/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libmnl }:
1+{ stdenv, fetchurl, pkg-config, libmnl }:
22
33stdenv.mkDerivation rec {
44 pname = "libnetfilter_cttimeout";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libmnl ];
1414
1515 meta = {
pkgs/development/libraries/libnetfilter_log/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
1+{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
22
33stdenv.mkDerivation rec {
44 pname = "libnetfilter_log";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 buildInputs = [ libmnl ];
1313 propagatedBuildInputs = [ libnfnetlink ];
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 meta = with stdenv.lib; {
1717 description = "Userspace library providing interface to packets that have been logged by the kernel packet filter";
pkgs/development/libraries/libnetfilter_queue/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }:
1+{ stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }:
22
33stdenv.mkDerivation rec {
44 version = "1.0.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libmnl libnfnetlink ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libnftnl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libmnl }:
1+{ stdenv, fetchurl, pkg-config, libmnl }:
22
33stdenv.mkDerivation rec {
44 version = "1.1.8";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libmnl ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/libnice/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchpatch
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, python3
88, gobject-introspection
99, gtk-doc
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 nativeBuildInputs = [
4040 meson
4141 ninja
42− pkgconfig
42+ pkg-config
4343 python3
4444 gobject-introspection
4545
pkgs/development/libraries/libnih/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, dbus, expat }:
1+{ stdenv, fetchurl, pkg-config, dbus, expat }:
22
33let version = "1.0.3"; in
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ dbus expat ];
1616
1717 doCheck = false; # fails 1 of 17 test
pkgs/development/libraries/libnixxml/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }:
1+{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
22
33stdenv.mkDerivation {
44 name = "libnixxml";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 configureFlags = [ "--with-gd" "--with-glib" ];
1212 CFLAGS = "-Wall";
1313 nativeBuildInputs = [ autoreconfHook ];
14− buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ];
14+ buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ];
1515 doCheck = false;
1616 postPatch = ''
1717 ./bootstrap
pkgs/development/libraries/libnotify/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, libxslt
77, docbook-xsl-ns
88, glib
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 gobject-introspection
3434 meson
3535 ninja
36− pkgconfig
36+ pkg-config
3737 libxslt
3838 docbook-xsl-ns
3939 ];
pkgs/development/libraries/libnsl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libnsl";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ libtirpc ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/liboauth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, nss, nspr, pkgconfig }:
1+{ fetchurl, stdenv, nss, nspr, pkg-config }:
22
33
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "dev" ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 propagatedBuildInputs = [ nss nspr ];
1717
pkgs/development/libraries/libodfgen/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
1+{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
22let
33 s = # Generated upstream information
44 rec {
@@ -9,7 +9,7 @@ let
99 url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz";
1010 sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij";
1111 };
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [
1414 boost cppunit zlib libwpg libwpd librevenge
1515 ];
pkgs/development/libraries/libofx/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl
1+{ stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl
22, autoconf, automake, libtool, gengetopt, libiconv }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 preConfigure = "./autogen.sh";
1616 configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
17− nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ];
17+ nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ];
1818 buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
1919
2020 meta = {
pkgs/development/libraries/liboggz/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libogg, pkgconfig }:
1+{ stdenv, fetchurl, libogg, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "liboggz-1.1.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 propagatedBuildInputs = [ libogg ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 homepage = "https://xiph.org/oggz/";
pkgs/development/libraries/liboil/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig }:
1+{stdenv, fetchurl, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "liboil-0.3.17";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 outputs = [ "out" "dev" "devdoc" ];
1414 outputBin = "dev"; # oil-bugreport
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
1919 # errors
pkgs/development/libraries/libopusenc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libopus }:
1+{ stdenv, fetchurl, pkg-config, libopus }:
22
33let
44 version = "0.2.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616
1717 doCheck = true;
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ libopus ];
2121
2222 meta = with stdenv.lib; {
pkgs/development/libraries/libosinfo/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, meson
66, ninja
77, gettext
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 outputs = [ "out" "dev" "devdoc" ];
3434
3535 nativeBuildInputs = [
36− pkgconfig
36+ pkg-config
3737 meson
3838 ninja
3939 vala
pkgs/development/libraries/libow/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
1+{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }:
22
33stdenv.mkDerivation rec {
44 version = "3.2p4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s";
1212 };
1313
14− nativeBuildInputs = [ autoconf automake pkgconfig ];
14+ nativeBuildInputs = [ autoconf automake pkg-config ];
1515
1616 meta = with stdenv.lib; {
1717 description = "1-Wire File System full library";
pkgs/development/libraries/libp11/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig
1+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config
22, openssl }:
33
44stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 "--with-enginesdir=${placeholder "out"}/lib/engines"
1717 ];
1818
19− nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
19+ nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
2020
2121 buildInputs = [ openssl ];
2222
pkgs/development/libraries/libpar2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libsigcxx }:
1+{ stdenv, fetchurl, pkg-config, libsigcxx }:
22
33let version = "0.4"; in
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libsigcxx ];
1616
1717 patches = [ ./libpar2-0.4-external-verification.patch ];
pkgs/development/libraries/libpcap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }:
1+{ stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }:
22
33with stdenv.lib;
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ flex bison ]
15− ++ optionals withBluez [ bluez.dev pkgconfig ];
15+ ++ optionals withBluez [ bluez.dev pkg-config ];
1616
1717 # We need to force the autodetection because detection doesn't
1818 # work in pure build environments.
pkgs/development/libraries/libpeas/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3
1+{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3
22, glib, gtk3, gobject-introspection, python3, ncurses
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
16+ nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ];
1717 buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ];
1818 propagatedBuildInputs = [
1919 # Required by libpeas-1.0.pc
pkgs/development/libraries/libphonenumber/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }:
1+{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }:
22
33stdenv.mkDerivation rec {
44 pname = "phonenumber";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [
1515 cmake
1616 gmock
17− pkgconfig
17+ pkg-config
1818 ];
1919
2020 buildInputs = [
pkgs/development/libraries/libpinyin/default.nix+2−2
@@ -2,7 +2,7 @@
22, autoreconfHook
33, glib
44, db
5−, pkgconfig
5+, pkg-config
66}:
77
88let
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 tar -xzf ${modelData} -C $sourceRoot/data
2727 '';
2828
29− nativeBuildInputs = [ autoreconfHook glib db pkgconfig ];
29+ nativeBuildInputs = [ autoreconfHook glib db pkg-config ];
3030
3131 meta = with stdenv.lib; {
3232 description = "Library for intelligent sentence-based Chinese pinyin input method";
pkgs/development/libraries/libplist/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }:
1+{ stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "libplist";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py";
1515
1616 nativeBuildInputs = [
17− pkgconfig
17+ pkg-config
1818 autoreconfHook
1919 ] ++ stdenv.lib.optionals enablePython [
2020 python
pkgs/development/libraries/libportal/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchpatch
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, gtk-doc
88, docbook-xsl-nons
99, docbook_xml_dtd_45
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 nativeBuildInputs = [
4040 meson
4141 ninja
42− pkgconfig
42+ pkg-config
4343 gtk-doc
4444 docbook-xsl-nons
4545 docbook_xml_dtd_45
pkgs/development/libraries/libproxy/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchFromGitHub
3−, pkgconfig
3+, pkg-config
44, cmake
55, zlib
66, fetchpatch
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 outputs = [ "out" "dev" "py3" ];
3232
3333 nativeBuildInputs = [
34− pkgconfig
34+ pkg-config
3535 cmake
3636 makeWrapper
3737 ];
pkgs/development/libraries/libpseudo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, glib, ncurses}:
1+{stdenv, fetchurl, pkg-config, glib, ncurses}:
22stdenv.mkDerivation rec {
33 name = "libpseudo-1.2.0";
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 mkdir -p $out/lib
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ glib ncurses ];
2121
2222 meta = with stdenv.lib; {
pkgs/development/libraries/libpsl/default.nix+2−2
@@ -8,7 +8,7 @@
88, libidn2
99, libunistring
1010, libxslt
11−, pkgconfig
11+, pkg-config
1212, python3
1313, valgrind
1414, publicsuffix-list
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 docbook_xml_dtd_43
3030 gtk-doc
3131 lzip
32− pkgconfig
32+ pkg-config
3333 python3
3434 libxslt
3535 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
pkgs/development/libraries/libpst/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, autoreconfHook, boost, libgsf,
2− pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
2+ pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }:
33
44stdenv.mkDerivation rec {
55 name = "libpst-0.6.75";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
1010 };
1111
12− nativeBuildInputs = [ autoreconfHook pkgconfig ];
12+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1313 buildInputs = [
1414 boost libgsf bzip2
1515 xmlto gettext imagemagick doxygen
pkgs/development/libraries/libqalculate/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen,
1+{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen,
22 autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 outputs = [ "out" "dev" "doc" ];
1616
17− nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];
17+ nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ];
1818 buildInputs = [ curl gettext libiconv readline ];
1919 configureFlags = ["--with-readline=${readline.dev}"];
2020 propagatedBuildInputs = [ libxml2 mpfr icu ];
pkgs/development/libraries/libqb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig }:
1+{ stdenv, fetchurl, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "libqb-0.17.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212
1313 meta = with stdenv.lib; {
1414 homepage = "https://github.com/clusterlabs/libqb";
pkgs/development/libraries/libr3/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, pcre
4−, pkgconfig
4+, pkg-config
55, check
66, autoreconfHook
77}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl";
1818 };
1919
20− nativeBuildInputs = [ autoreconfHook pkgconfig ];
20+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2121
2222 buildInputs = [ check ];
2323 propagatedBuildInputs = [ pcre ];
pkgs/development/libraries/libraw/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libraw";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 propagatedBuildInputs = [ lcms2 ];
1717
18− nativeBuildInputs = [ autoreconfHook pkgconfig ];
18+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1919
2020 enableParallelBuilding = true;
2121
pkgs/development/libraries/librdf/rasqal.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }:
1+{ stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }:
22
33stdenv.mkDerivation rec {
44 name = "rasqal-0.9.33";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212
1313 buildInputs = [ gmp pcre libxml2 ];
1414
pkgs/development/libraries/librdf/redland.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
1+{ stdenv, fetchurl, pkg-config, openssl, libxslt, perl
22, curl, pcre, libxml2, librdf_rasqal, gmp
33, libmysqlclient, withMysql ? false
44, postgresql, withPostgresql ? false
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681";
1515 };
1616
17− nativeBuildInputs = [ perl pkgconfig ];
17+ nativeBuildInputs = [ perl pkg-config ];
1818
1919 buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
2020 ++ stdenv.lib.optional withMysql libmysqlclient
pkgs/development/libraries/librelp/default.nix+2−2
@@ -2,7 +2,7 @@
22, autoreconfHook
33, gnutls
44, openssl
5−, pkgconfig
5+, pkg-config
66, zlib
77}:
88
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig autoreconfHook ];
20+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2121 buildInputs = [ gnutls zlib openssl ];
2222
2323 meta = with stdenv.lib; {
pkgs/development/libraries/librep/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, pkgconfig, autoreconfHook
2+, pkg-config, autoreconfHook
33, readline, texinfo
44, gdbm, gmp, libffi }:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";
1616 };
1717
18− nativeBuildInputs = [ autoreconfHook pkgconfig ];
18+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1919 buildInputs = [ readline texinfo ];
2020 propagatedBuildInputs = [ gdbm gmp libffi ];
2121
pkgs/development/libraries/librest/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "rest";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig gobject-introspection ];
12+ nativeBuildInputs = [ pkg-config gobject-introspection ];
1313 buildInputs = [ glib libsoup ];
1414
1515 configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
pkgs/development/libraries/librevenge/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}:
1+{stdenv, fetchurl, boost, pkg-config, cppunit, zlib}:
22let
33 s = # Generated upstream information
44 rec {
@@ -9,7 +9,7 @@ let
99 url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz";
1010 sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk";
1111 };
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [
1414 boost cppunit zlib
1515 ];
pkgs/development/libraries/librevisa/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libusb1 }:
1+{ stdenv, fetchurl, pkg-config, libusb1 }:
22
33# TODO: add VXI development files, for VXI-11 (TCPIP) support
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libusb1 ];
1515
1616 meta = with stdenv.lib; {
pkgs/development/libraries/librsvg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2
1+{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2
22, bzip2, libintl, darwin, rustc, cargo, gnome3
33, vala, gobject-introspection }:
44
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
2525
26− nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
26+ nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ]
2727 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
2828 ApplicationServices
2929 ]);
pkgs/development/libraries/libsamplerate/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }:
1+{ stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }:
22
33let
44 inherit (stdenv.lib) optionals optionalString;
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libsndfile ]
1616 ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
1717
pkgs/development/libraries/libsearpc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
1+{stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}:
22
33stdenv.mkDerivation rec {
44 version = "3.2.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 patches = [ ./libsearpc.pc.patch ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ];
1818 propagatedBuildInputs = [ glib jansson ];
1919
pkgs/development/libraries/libsecret/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3
1+{ stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
22, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
33, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
44
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 propagatedBuildInputs = [ glib ];
2121 nativeBuildInputs = [
22− pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
22+ pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
2323 gobject-introspection vala gtk-doc glib
2424 ];
2525 buildInputs = [ libgcrypt ];
pkgs/development/libraries/libserialport/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, udev, darwin }:
1+{ stdenv, fetchurl, pkg-config, udev, darwin }:
22
33stdenv.mkDerivation rec {
44 name = "libserialport-0.1.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = stdenv.lib.optional stdenv.isLinux udev
1313 ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit;
1414
pkgs/development/libraries/libshout/default.nix+3−3
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, libvorbis, libtheora, speex }:
33
4−# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
4+# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc
55
66stdenv.mkDerivation rec {
77 name = "libshout-2.4.4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 outputs = [ "out" "dev" "doc" ];
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 propagatedBuildInputs = [ libvorbis libtheora speex ];
1818
1919 meta = {
pkgs/development/libraries/libsidplayfp/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, lib
33, fetchurl
4−, pkgconfig
4+, pkg-config
55, docSupport ? true
66, doxygen ? null
77, graphviz ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0";
2222 };
2323
24− nativeBuildInputs = [ pkgconfig ]
24+ nativeBuildInputs = [ pkg-config ]
2525 ++ optionals docSupport [ doxygen graphviz ];
2626
2727 installTargets = [ "install" ]
pkgs/development/libraries/libsigcxx/1.2.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, m4}:
1+{stdenv, fetchurl, pkg-config, m4}:
22
33stdenv.mkDerivation rec {
44 name = "libsigc++-1.2.7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ m4];
1313
1414 meta = with stdenv.lib; {
pkgs/development/libraries/libsigcxx/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, gnum4, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libsigc++";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig gnum4 ];
12+ nativeBuildInputs = [ pkg-config gnum4 ];
1313
1414 doCheck = true;
1515
pkgs/development/libraries/libsignon-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, nix-update-script, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
1+{ stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 pname = "libsignon-glib";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 gtk-doc
2323 meson
2424 ninja
25− pkgconfig
25+ pkg-config
2626 python3
2727 vala
2828 ];
pkgs/development/libraries/libskk/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub,
2− libtool, gettext, pkgconfig,
2+ libtool, gettext, pkg-config,
33 vala, gnome-common, gobject-introspection,
44 libgee, json-glib, skk-dicts, libxkbcommon }:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 buildInputs = [ skk-dicts libxkbcommon ];
18− nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkgconfig ];
18+ nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ];
1919 propagatedBuildInputs = [ libgee json-glib ];
2020
2121 preConfigure = ''
pkgs/development/libraries/libsmartcols/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }:
22
33stdenv.mkDerivation rec {
44 name = "libsmartcols";
55 version = "v2.36.1";
66
7− nativeBuildInputs = [ autoreconfHook pkgconfig python3 ];
7+ nativeBuildInputs = [ autoreconfHook pkg-config python3 ];
88
99 src = fetchFromGitHub {
1010 owner = "karelzak";
pkgs/development/libraries/libsndfile/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3
1+{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3
22, Carbon, AudioToolbox
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ];
16+ nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ];
1717 buildInputs = [ flac libogg libopus libvorbis ]
1818 ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
1919
pkgs/development/libraries/libsoup/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture
1+{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture
22, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
33, libpsl, python3, brotli
44}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 ] ++ lib.optionals stdenv.isLinux [
2828 libsysprof-capture
2929 ];
30− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
30+ nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ];
3131 propagatedBuildInputs = [ glib libxml2 ];
3232
3333 NIX_CFLAGS_COMPILE = [ "-lpthread" ];
pkgs/development/libraries/libspatialite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
1+{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }:
22
33with lib;
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 buildInputs = [ libxml2 sqlite zlib proj geos libiconv ];
1616
pkgs/development/libraries/libspectre/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }:
1+{ fetchurl, stdenv, pkg-config, ghostscript, cairo }:
22
33stdenv.mkDerivation rec {
44 name = "libspectre-0.2.7";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 buildInputs = [
1414 # Need `libgs.so'.
15− pkgconfig ghostscript cairo /*for tests*/
15+ pkg-config ghostscript cairo /*for tests*/
1616 ];
1717
1818 doCheck = true;
pkgs/development/libraries/libspectrum/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, perl, pkgconfig, audiofile, bzip2, glib, libgcrypt, zlib }:
1+{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }:
22
33stdenv.mkDerivation rec {
44 name = "libspectrum-1.4.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx";
99 };
1010
11− nativeBuildInputs = [ perl pkgconfig ];
11+ nativeBuildInputs = [ perl pkg-config ];
1212
1313 buildInputs = [ audiofile bzip2 glib libgcrypt zlib ];
1414
pkgs/development/libraries/libspiro/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }:
1+{stdenv, pkg-config, autoreconfHook, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "libspiro";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig autoreconfHook ];
14+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1515
1616 meta = with stdenv.lib; {
1717 description = "A library that simplifies the drawing of beautiful curves";
pkgs/development/libraries/libspotify/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }:
1+{ stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }:
22
33let
44 version = "12.1.51";
@@ -65,7 +65,7 @@ else stdenv.mkDerivation {
6565 pname = "libspotify-samples";
6666 inherit version;
6767 src = libspotify.src;
68− nativeBuildInputs = [ pkgconfig ];
68+ nativeBuildInputs = [ pkg-config ];
6969 buildInputs = [ libspotify readline ]
7070 ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
7171 postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
pkgs/development/libraries/libssh/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
1+{ stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }:
22
33stdenv.mkDerivation rec {
44 pname = "libssh";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 buildInputs = [ zlib openssl libsodium ];
2121
22− nativeBuildInputs = [ cmake pkgconfig ];
22+ nativeBuildInputs = [ cmake pkg-config ];
2323
2424 meta = with stdenv.lib; {
2525 description = "SSH client library";
pkgs/development/libraries/libtap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, cmake, perl }:
1+{ stdenv, fetchurl, pkg-config, cmake, perl }:
22
33with stdenv.lib;
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 propagatedBuildInputs = [ cmake perl ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/libtelnet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }:
1+{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }:
22
33stdenv.mkDerivation {
44 pname = "libtelnet";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "1lp6gdbndsp2w8mhy88c2jknxj2klvnggvq04ln7qjg8407ifpda";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig autoreconfHook ];
14+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1515 buildInputs = [ zlib ];
1616
1717 meta = {
pkgs/development/libraries/libtermkey/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses, unibilium }:
1+{ stdenv, lib, fetchzip, libtool, pkg-config, ncurses, unibilium }:
22
33stdenv.mkDerivation rec {
44 pname = "libtermkey";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 makeFlags = [ "PREFIX=$(out)" ]
1414 ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
1515
16− nativeBuildInputs = [ libtool pkgconfig ];
16+ nativeBuildInputs = [ libtool pkg-config ];
1717 buildInputs = [ ncurses unibilium ];
1818
1919 meta = with lib; {
pkgs/development/libraries/libtheora/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libogg, libvorbis, pkgconfig}:
1+{stdenv, fetchurl, libogg, libvorbis, pkg-config}:
22
33stdenv.mkDerivation rec {
44 name = "libtheora-1.1.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 outputs = [ "out" "dev" "devdoc" ];
1212 outputDoc = "devdoc";
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 propagatedBuildInputs = [ libogg libvorbis ];
1616
1717 # GCC's -fforce-addr flag is not supported by clang
pkgs/development/libraries/libtiff/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33
4−, pkgconfig
4+, pkg-config
55
66, zlib
77, libjpeg
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 outputs = [ "bin" "dev" "out" "man" "doc" ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323
2424 propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
2525
pkgs/development/libraries/libtiger/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, libkate, pango, cairo, pkgconfig, darwin }:
1+{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }:
22
33stdenv.mkDerivation rec {
44 name = "libtiger-0.3.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ libkate pango cairo ]
1313 ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices;
1414
pkgs/development/libraries/libtorrent-rasterbar/1.1.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf
1+{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf
22, zlib, boost, openssl, libtool, python, libiconv, ncurses
33}:
44
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
2222 };
2323
2424 enableParallelBuilding = true;
25− nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
25+ nativeBuildInputs = [ automake autoconf libtool pkg-config ];
2626 buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
2727 preConfigure = "./autotool.sh";
2828
pkgs/development/libraries/libtoxcore/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
2−, libvpx, check, libconfig, pkgconfig }:
2+, libvpx, check, libconfig, pkg-config }:
33
44let
55 generic = { version, sha256 }:
@@ -26,7 +26,7 @@ let
2626 libopus libvpx
2727 ];
2828
29− nativeBuildInputs = [ cmake pkgconfig ];
29+ nativeBuildInputs = [ cmake pkg-config ];
3030
3131 doCheck = false; # hangs, tries to access the net?
3232 checkInputs = [ check ];
pkgs/development/libraries/libtoxcore/new-api.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
2−, libvpx, check, libconfig, pkgconfig }:
2+, libvpx, check, libconfig, pkg-config }:
33
44stdenv.mkDerivation {
55 name = "tox-core-new-20160727";
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
3030 ];
3131
3232
33− nativeBuildInputs = [ autoreconfHook pkgconfig ];
33+ nativeBuildInputs = [ autoreconfHook pkg-config ];
3434 buildInputs = [
3535 autoreconfHook libsodium ncurses check libconfig
3636 ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
pkgs/development/libraries/libtsm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }:
1+{ stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }:
22
33stdenv.mkDerivation rec {
44 pname = "libtsm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ libxkbcommon ];
1515
16− nativeBuildInputs = [ cmake pkgconfig ];
16+ nativeBuildInputs = [ cmake pkg-config ];
1717
1818 meta = with stdenv.lib; {
1919 description = "Terminal-emulator State Machine";
pkgs/development/libraries/libu2f-host/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, hidapi }:
1+{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }:
22
33stdenv.mkDerivation rec {
44 pname = "libu2f-host";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 })
1919 ];
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [ json_c hidapi ];
2323
2424 doCheck = true;
pkgs/development/libraries/libu2f-server/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }:
1+{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }:
22
33stdenv.mkDerivation rec {
44 name = "libu2f-server-1.1.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 })
1717 ];
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ json_c openssl check file help2man which gengetopt ];
2121
2222 meta = with stdenv.lib; {
pkgs/development/libraries/libubox/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }:
1+{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }:
22
33stdenv.mkDerivation {
44 pname = "libubox";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212
1313 cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [ json_c ];
1717
1818 meta = with lib; {
pkgs/development/libraries/libui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }:
22
33let
44 shortName = "libui";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm";
1616 };
1717
18− nativeBuildInputs = [ cmake pkgconfig ];
18+ nativeBuildInputs = [ cmake pkg-config ];
1919 propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3
2020 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
2121
pkgs/development/libraries/libuinputplus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libuinputplus";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515
1616 meta = with stdenv.lib; {
1717 inherit (src.meta) homepage;
pkgs/development/libraries/libunique/3.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, dbus, dbus-glib, gtk3, gobject-introspection
33, gtk-doc, docbook_xml_dtd_45, docbook_xsl
44, libxslt, libxml2 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
2222
2323 meta = {
pkgs/development/libraries/libunique/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }:
1+{ stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }:
22
33stdenv.mkDerivation rec {
44 pname = "libunique";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 ./1.1.6-include-terminator.patch
2121 ] ++ [ ./gcc7-bug.patch ];
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424 buildInputs = [ glib gtk2 dbus-glib ];
2525
2626 # Don't make deprecated usages hard errors
pkgs/development/libraries/libunity/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchgit
3−, pkgconfig
3+, pkg-config
44, glib
55, vala
66, dee
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
2828 autoreconfHook
2929 gobject-introspection
3030 intltool
31− pkgconfig
31+ pkg-config
3232 python3
3333 vala
3434 ];
pkgs/development/libraries/libusb-compat/0.1.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, autoreconfHook
55, patchelf
6−, pkgconfig
6+, pkg-config
77, libusb1
88}:
99
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
1515 outputBin = "dev";
1616
17− nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ];
17+ nativeBuildInputs = [ autoreconfHook patchelf pkg-config ];
1818
1919 buildInputs = [ libusb1 ];
2020
pkgs/development/libraries/libusb1/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
66, udev ? null
77, libobjc
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 outputs = [ "out" "dev" ];
2626
27− nativeBuildInputs = [ pkgconfig autoreconfHook ];
27+ nativeBuildInputs = [ pkg-config autoreconfHook ];
2828 propagatedBuildInputs =
2929 stdenv.lib.optional enableUdev udev ++
3030 stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
pkgs/development/libraries/libusbmuxd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }:
22
33stdenv.mkDerivation rec {
44 pname = "libusbmuxd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ libplist ];
1616
1717 meta = with stdenv.lib; {
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
1+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
44 version = "1.40.0";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 sed '/${tdRegexp}/d' -i test/test-list.h
5151 '';
5252
53− nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
53+ nativeBuildInputs = [ automake autoconf libtool pkg-config ];
5454 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
5555
5656 preConfigure = ''
pkgs/development/libraries/libva/1.0.0.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
1+{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi
22, libGL, mesa
33, minimal ? false, libva1-minimal
44}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 outputs = [ "bin" "dev" "out" ];
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818
1919 buildInputs = [ libdrm ]
2020 ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ];
pkgs/development/libraries/libvdpau-va-gl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp
22, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ];
1717
1818 doCheck = false; # fails. needs DRI access
pkgs/development/libraries/libvdpau/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }:
1+{ stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }:
22
33stdenv.mkDerivation rec {
44 pname = "libvdpau";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 outputs = [ "out" "dev" ];
1414
15− nativeBuildInputs = [ meson ninja pkgconfig ];
15+ nativeBuildInputs = [ meson ninja pkg-config ];
1616 buildInputs = with xorg; [ xorgproto libXext ];
1717
1818 propagatedBuildInputs = [ xorg.libX11 ];
pkgs/development/libraries/libviper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}:
1+{stdenv, fetchurl, pkg-config, glib, ncurses, gpm}:
22stdenv.mkDerivation rec {
33 name = "libviper-1.4.6";
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 mkdir -p $out/lib
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ glib ncurses gpm];
2121
2222 meta = with stdenv.lib; {
pkgs/development/libraries/libvirt-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala
1+{ stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
22, libcap_ng, libvirt, libxml2
33}:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
15+ nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ];
1616 buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
1717
1818 enableParallelBuilding = true;
pkgs/development/libraries/libvirt/5.9.0.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchgit
2−, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
2+, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch
33, coreutils, libxml2, gnutls, perl, python2, attr
44, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
55, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333 fetchSubmodules = true;
3434 };
3535
36− nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ];
36+ nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ];
3737 buildInputs = [
3838 libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
3939 libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
pkgs/development/libraries/libvisio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf
1+{ stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf
22, librevenge, libxml2, icu, perl, cppunit, doxygen
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig cppunit doxygen ];
16+ nativeBuildInputs = [ pkg-config cppunit doxygen ];
1717 buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ];
1818
1919 configureFlags = [
pkgs/development/libraries/libvisual/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib }:
1+{ stdenv, fetchurl, pkg-config, glib }:
22
33stdenv.mkDerivation rec {
44 name = "libvisual-0.4.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ glib ];
1313
1414 hardeningDisable = [ "format" ];
pkgs/development/libraries/libvmi/default.nix+2−2
@@ -4,7 +4,7 @@
44 bison,
55 flex,
66 glib,
7− pkgconfig,
7+ pkg-config,
88 json_c,
99 xen,
1010 libvirt,
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 };
2626
2727 buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen);
28− nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
28+ nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
2929
3030 configureFlags = optional (!xenSupport) "--disable-xen";
3131
pkgs/development/libraries/libvorbis/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libogg, pkgconfig }:
1+{ stdenv, fetchurl, libogg, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "libvorbis-1.3.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 outputs = [ "out" "dev" "doc" ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ libogg ];
1515
1616 doCheck = true;
pkgs/development/libraries/libvterm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, ncurses }:
1+{ stdenv, fetchurl, pkg-config, glib, ncurses }:
22
33stdenv.mkDerivation rec {
44 name = "libvterm-0.99.7";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 mkdir -p $out/lib
1818 '';
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ glib ncurses ];
2222
2323 meta = with stdenv.lib; {
pkgs/development/libraries/libwacom/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }:
1+{ stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }:
22
33stdenv.mkDerivation rec {
44 pname = "libwacom";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig meson ninja doxygen ];
16+ nativeBuildInputs = [ pkg-config meson ninja doxygen ];
1717
1818 mesonFlags = [ "-Dtests=disabled" ];
1919
pkgs/development/libraries/libwmf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig
1+{ stdenv, fetchFromGitHub, pkg-config
22, freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib
33}:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ];
2020 enableParallelBuilding = true;
2121
pkgs/development/libraries/libwnck/3.x.nix+2−2
@@ -3,7 +3,7 @@
33, fetchpatch
44, meson
55, ninja
6−, pkgconfig
6+, pkg-config
77, gtk-doc
88, docbook_xsl
99, docbook_xml_dtd_412
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 nativeBuildInputs = [
3535 meson
3636 ninja
37− pkgconfig
37+ pkg-config
3838 gettext
3939 gobject-introspection
4040 gtk-doc
pkgs/development/libraries/libwnck/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }:
1+{ stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }:
22
33stdenv.mkDerivation rec {
44 pname = "libwnck";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 outputs = [ "out" "dev" "devdoc" ];
1313 outputBin = "dev";
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ];
1717 # ?another optional: startup-notification
1818
pkgs/development/libraries/libwpd/0.8.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
1+{ stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }:
22
33stdenv.mkDerivation rec {
44 name = "libwpd-0.8.14";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 buildInputs = [ glib libgsf libxml2 ];
1414
15− nativeBuildInputs = [ pkgconfig bzip2 ];
15+ nativeBuildInputs = [ pkg-config bzip2 ];
1616
1717 meta = with stdenv.lib; {
1818 description = "Library for importing WordPerfect documents";
pkgs/development/libraries/libwpd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }:
1+{ stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }:
22
33stdenv.mkDerivation rec {
44 name = "libwpd-0.10.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ glib libgsf libxml2 zlib librevenge ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 description = "A library for importing and exporting WordPerfect documents";
pkgs/development/libraries/libwpg/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }:
1+{ stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }:
22
33stdenv.mkDerivation rec {
44 name = "libwpg-0.3.3";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ libwpd zlib librevenge ];
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 meta = with stdenv.lib; {
1515 homepage = "http://libwpg.sourceforge.net";
pkgs/development/libraries/libwps/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
1+{ stdenv, fetchurl, boost, pkg-config, librevenge, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "libwps";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ boost librevenge zlib ];
1414
1515 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
pkgs/development/libraries/libxcomp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "libxcomp";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ libjpeg libpng libX11 zlib ];
13− nativeBuildInputs = [ autoreconfHook pkgconfig ];
13+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1414
1515 preAutoreconf = ''
1616 cd nxcomp/
pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
1+{ stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }:
22
33stdenv.mkDerivation rec {
44 name = "libxkbcommon-0.7.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 outputs = [ "out" "dev" ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ yacc flex xkeyboard_config libxcb ];
1515
1616 configureFlags = [
pkgs/development/libraries/libxklavier/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
1+{ stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
22, glib, isocodes, gobject-introspection }:
33
44let
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 # TODO: enable xmodmap support, needs xmodmap DB
2222 propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
2323
24− nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
24+ nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ];
2525
2626 buildInputs = [ gobject-introspection ];
2727
pkgs/development/libraries/libxmlb/default.nix+2−2
@@ -7,7 +7,7 @@
77, gtk-doc
88, meson
99, ninja
10−, pkgconfig
10+, pkg-config
1111, python3
1212, shared-mime-info
1313, nixosTests
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 gtk-doc
3838 meson
3939 ninja
40− pkgconfig
40+ pkg-config
4141 (python3.withPackages (pkgs: with pkgs; [ setuptools ]))
4242 shared-mime-info
4343 ];
pkgs/development/libraries/libxmlxx/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libxml++";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "devdoc" ];
1313
14− nativeBuildInputs = [ pkgconfig perl ];
14+ nativeBuildInputs = [ pkg-config perl ];
1515
1616 propagatedBuildInputs = [ libxml2 glibmm ];
1717
pkgs/development/libraries/libxmlxx/v3.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
1+{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }:
22
33stdenv.mkDerivation rec {
44 pname = "libxml++";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "dev" "doc" "devdoc" ];
1313
14− nativeBuildInputs = [ pkgconfig perl ];
14+ nativeBuildInputs = [ pkg-config perl ];
1515
1616 buildInputs = [ glibmm ];
1717
pkgs/development/libraries/libykclient/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }:
22
33stdenv.mkDerivation {
44 pname = "libykclient";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj";
1111 };
1212
13− nativeBuildInputs = [ autoreconfHook pkgconfig help2man ];
13+ nativeBuildInputs = [ autoreconfHook pkg-config help2man ];
1414 buildInputs = [ curl ];
1515
1616 meta = with stdenv.lib; {
pkgs/development/libraries/libykneomgr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }:
1+{ stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }:
22
33stdenv.mkDerivation rec {
44 name = "libykneomgr-0.1.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ pcsclite libzip help2man ];
1313
1414 configureFlags = [
pkgs/development/libraries/libzapojit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
1+{ stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 pname = "libzapojit";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
14+ nativeBuildInputs = [ pkg-config intltool gobject-introspection ];
1515 propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
1616
1717 passthru = {
pkgs/development/libraries/libzip/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6";
1010 };
1111
12− # Fix pkgconfig file paths
12+ # Fix pkg-config file paths
1313 postPatch = ''
1414 sed -i CMakeLists.txt \
1515 -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \
pkgs/development/libraries/libzmf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
1+{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}:
22
33stdenv.mkDerivation rec {
44 pname = "libzmf";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ boost icu libpng librevenge zlib cppunit ];
13− nativeBuildInputs = [ doxygen pkgconfig ];
13+ nativeBuildInputs = [ doxygen pkg-config ];
1414 configureFlags = [ "--disable-werror" ];
1515
1616 meta = {
pkgs/development/libraries/lightstep-tracer-cpp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
1+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
22, opentracing-cpp, protobuf, zlib
33, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null
44}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 };
2020
2121 nativeBuildInputs = [
22− cmake pkgconfig
22+ cmake pkg-config
2323 ];
2424
2525 buildInputs = [
pkgs/development/libraries/linbox/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, autoreconfHook
44, givaro
5−, pkgconfig
5+, pkg-config
66, blas
77, lapack
88, fflas-ffpack
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 nativeBuildInputs = [
2727 autoreconfHook
28− pkgconfig
28+ pkg-config
2929 ];
3030
3131 buildInputs = [
pkgs/development/libraries/lirc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
1+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
22 alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
33
44stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 touch lib/lirc/input_map.inc
3131 '';
3232
33− nativeBuildInputs = [ autoreconfHook pkgconfig help2man
33+ nativeBuildInputs = [ autoreconfHook pkg-config help2man
3434 (python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
3535
3636 buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ];
pkgs/development/libraries/loudmouth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }:
1+{ stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }:
22
33stdenv.mkDerivation rec {
44 version = "1.5.3";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 propagatedBuildInputs = [ openssl libidn glib zlib ];
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020
2121 meta = with stdenv.lib; {
2222 description = "A lightweight C library for the Jabber protocol";
pkgs/development/libraries/lrdf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
1+{ config, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
22, librdf_raptor2, ladspaH, openssl, zlib
33, doCheck ? config.doCheckByDefault or false, ladspaPlugins
44}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
1919 '';
2020
21− nativeBuildInputs = [ autoreconfHook pkgconfig ];
21+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2222
2323 propagatedBuildInputs = [ librdf_raptor2 ];
2424
pkgs/development/libraries/luksmeta/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc
22, cryptsetup
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ];
1717 buildInputs = [ cryptsetup ];
1818
1919 meta = {
pkgs/development/libraries/mediastreamer/default.nix+2−2
@@ -23,7 +23,7 @@
2323, libv4l
2424, libvpx
2525, ortp
26−, pkgconfig
26+, pkg-config
2727, python
2828, SDL
2929, speex
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 cmake
5858 doxygen
5959 intltool
60− pkgconfig
60+ pkg-config
6161 python
6262 ];
6363
pkgs/development/libraries/mediastreamer/msopenh264.nix+2−2
@@ -4,7 +4,7 @@
44, fetchpatch
55, mediastreamer
66, openh264
7−, pkgconfig
7+, pkg-config
88, stdenv
99}:
1010
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr";
2424 };
2525
26− nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
26+ nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
2727 buildInputs = [ mediastreamer openh264 ];
2828
2929 # Do not build static libraries
pkgs/development/libraries/menu-cache/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
1+{ stdenv, fetchurl, glib, pkg-config, libfm-extra }:
22
33let name = "menu-cache-1.1.0";
44in
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ glib libfm-extra ];
1515
pkgs/development/libraries/mesa-glu/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }:
1+{ stdenv, fetchurl, pkg-config, libGL, ApplicationServices }:
22
33stdenv.mkDerivation rec {
44 pname = "glu";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 propagatedBuildInputs = [ libGL ]
1414 ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
1515
pkgs/development/libraries/mesa/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, fetchpatch, buildPackages
2−, pkgconfig, intltool, ninja, meson
2+, pkg-config, intltool, ninja, meson
33, file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl
44, llvmPackages, libffi, libomxil-bellagio, libva-minimal
55, libelf, libvdpau, python3Packages
@@ -129,10 +129,10 @@ stdenv.mkDerivation {
129129 ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
130130 ++ lib.optional withValgrind valgrind-light;
131131
132− depsBuildBuild = [ pkgconfig ];
132+ depsBuildBuild = [ pkg-config ];
133133
134134 nativeBuildInputs = [
135− pkgconfig meson ninja
135+ pkg-config meson ninja
136136 intltool bison flex file
137137 python3Packages.python python3Packages.Mako
138138 ] ++ lib.optionals (elem "wayland" eglPlatforms) [
pkgs/development/libraries/mlt/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, makeWrapper
22, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif
3−, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2
3+, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
44, gtk2, genericUpdater, common-updater-scripts, libebur128
55}:
66
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 buildInputs = [
1919 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
20− makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128
20+ makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128
2121 opencv4 SDL2
2222 ];
2323
pkgs/development/libraries/mlt/qt-5.nix+2−2
@@ -9,7 +9,7 @@
99, libvorbis
1010, libxml2
1111, movit
12−, pkgconfig
12+, pkg-config
1313, sox
1414, qtbase
1515, qtsvg
@@ -45,7 +45,7 @@ mkDerivation rec {
4545 libvorbis
4646 libxml2
4747 movit
48− pkgconfig
48+ pkg-config
4949 qtbase
5050 qtsvg
5151 sox
pkgs/development/libraries/mongoc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, perl, pkgconfig, libbson
1+{ stdenv, fetchzip, perl, pkg-config, libbson
22, openssl, which, zlib, snappy
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig which perl ];
14+ nativeBuildInputs = [ pkg-config which perl ];
1515 buildInputs = [ openssl zlib ];
1616 propagatedBuildInputs = [ libbson snappy ];
1717
pkgs/development/libraries/mono-addins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }:
22
33stdenv.mkDerivation rec {
44 pname = "mono-addins";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1616
1717 # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
1818 buildInputs = [ mono4 gtk-sharp-2_0 ];
pkgs/development/libraries/motif/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libtool
1+{ stdenv, fetchurl, pkg-config, libtool
22, xlibsWrapper, xbitmaps, libXrender, libXmu, libXt
33, expat, libjpeg, libpng, libiconv
44, flex
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 expat libjpeg libpng libiconv
2323 ];
2424
25− nativeBuildInputs = [ pkgconfig flex ];
25+ nativeBuildInputs = [ pkg-config flex ];
2626
2727 propagatedBuildInputs = [ libXp libXau ];
2828
pkgs/development/libraries/movit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
1+{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "movit";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 propagatedBuildInputs = [ eigen epoxy ];
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ SDL2 fftw gtest ];
2020
2121 enableParallelBuilding = true;
pkgs/development/libraries/msgpuck/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "msgpuck";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 outputs = [ "out" "dev" ];
1515
16− nativeBuildInputs = [ cmake pkgconfig ];
16+ nativeBuildInputs = [ cmake pkg-config ];
1717
1818 meta = with stdenv.lib; {
1919 description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
pkgs/development/libraries/msilbc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }:
1+{ stdenv, fetchurl, ilbc, mediastreamer, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "msilbc-2.1.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 propagatedBuildInputs = [ ilbc mediastreamer ];
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 configureFlags = [
1515 "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include"
pkgs/development/libraries/mtxclient/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, fetchpatch
44, cmake
5−, pkgconfig
5+, pkg-config
66, boost17x
77, openssl
88, zlib
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636
3737 nativeBuildInputs = [
3838 cmake
39− pkgconfig
39+ pkg-config
4040 ];
4141 buildInputs = [
4242 spdlog
pkgs/development/libraries/mumlib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
22, boost, openssl, log4cpp, libopus, protobuf }:
33with lib; stdenv.mkDerivation {
44 pname = "mumlib";
@@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation {
1212 };
1313
1414 buildInputs = [ boost openssl libopus protobuf log4cpp ];
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 installPhase = ''
1717 install -Dm555 libmumlib.so $out/lib/libmumlib.so
1818 cp -a ../include $out
pkgs/development/libraries/mypaint-brushes/1.0.nix+2−2
@@ -2,7 +2,7 @@
22, autoconf
33, automake
44, fetchFromGitHub
5−, pkgconfig
5+, pkg-config
66}:
77
88stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 nativeBuildInputs = [
2020 autoconf
2121 automake
22− pkgconfig
22+ pkg-config
2323 ];
2424
2525 preConfigure = "./autogen.sh";
pkgs/development/libraries/mypaint-brushes/default.nix+2−2
@@ -2,7 +2,7 @@
22, autoconf
33, automake
44, fetchFromGitHub
5−, pkgconfig
5+, pkg-config
66}:
77
88stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 nativeBuildInputs = [
2020 autoconf
2121 automake
22− pkgconfig
22+ pkg-config
2323 ];
2424
2525 preConfigure = "./autogen.sh";
pkgs/development/libraries/mythes/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }:
1+{ stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }:
22
33stdenv.mkDerivation rec {
44 name = "mythes-1.2.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ hunspell ];
12− nativeBuildInputs = [ ncurses pkgconfig perl ];
12+ nativeBuildInputs = [ ncurses pkg-config perl ];
1313
1414 meta = {
1515 homepage = "http://hunspell.sourceforge.net/";
pkgs/development/libraries/ncurses/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22
33, abiVersion ? "6"
44, mouseSupport ? false
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
5252
5353 depsBuildBuild = [ buildPackages.stdenv.cc ];
5454 nativeBuildInputs = [
55− pkgconfig
55+ pkg-config
5656 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
5757 buildPackages.ncurses
5858 ];
pkgs/development/libraries/neardal/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }:
1+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }:
22
33stdenv.mkDerivation {
44 name = "neardal-0.7-post-git-20150930";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ autoconf automake libtool glib readline makeWrapper ];
1515
1616 preConfigure = ''
pkgs/development/libraries/neon/0.29.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxml2, pkgconfig, perl
1+{ stdenv, fetchurl, libxml2, pkg-config, perl
22, compressionSupport ? true, zlib ? null
33, sslSupport ? true, openssl ? null
44, static ? false
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828 buildInputs = [libxml2 openssl]
2929 ++ stdenv.lib.optional compressionSupport zlib;
3030
pkgs/development/libraries/neon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxml2, pkgconfig, perl
1+{ stdenv, fetchurl, libxml2, pkg-config, perl
22, compressionSupport ? true, zlib ? null
33, sslSupport ? true, openssl ? null
44, static ? stdenv.hostPlatform.isStatic
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828 buildInputs = [libxml2 openssl]
2929 ++ stdenv.lib.optional compressionSupport zlib;
3030
pkgs/development/libraries/nghttp2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22
33# Optional Dependencies
44, openssl ? null, zlib ? null
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 outputs = [ "bin" "out" "dev" "lib" ]
3838 ++ optional enablePython "python";
3939
40− nativeBuildInputs = [ pkgconfig ];
40+ nativeBuildInputs = [ pkg-config ];
4141 buildInputs = [ openssl ]
4242 ++ optional enableLibEv libev
4343 ++ [ zlib ]
pkgs/development/libraries/nix-plugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
1+{ stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }:
22let version = "6.0.0"; in
33stdenv.mkDerivation {
44 pname = "nix-plugins";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515
1616 buildInputs = [ nix boost ];
1717
pkgs/development/libraries/notcurses/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, cmake, pkgconfig, pandoc, libunistring, ncurses, ffmpeg,
1+{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg,
22 fetchFromGitHub, lib,
33 multimediaSupport ? true
44}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111
1212 outputs = [ "out" "dev" ];
1313
14− nativeBuildInputs = [ cmake pkgconfig pandoc ];
14+ nativeBuildInputs = [ cmake pkg-config pandoc ];
1515
1616 buildInputs = [ libunistring ncurses ]
1717 ++ lib.optional multimediaSupport ffmpeg;
pkgs/development/libraries/notify-sharp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook
1+{ stdenv, fetchFromGitLab, pkg-config, autoreconfHook
22, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
33
44stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 nativeBuildInputs = [
18− pkgconfig autoreconfHook
18+ pkg-config autoreconfHook
1919 ];
2020
2121 buildInputs = [
pkgs/development/libraries/ntrack/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }:
1+{ stdenv, fetchurl, qt4, pkg-config, libnl, python }:
22
33let
44 version = "016";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [ libnl qt4 ];
1717
18− nativeBuildInputs = [ pkgconfig python ];
18+ nativeBuildInputs = [ pkg-config python ];
1919
2020 # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
2121 NIX_CFLAGS_COMPILE = "-Wno-error";
pkgs/development/libraries/nuspell/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }:
22
33stdenv.mkDerivation rec {
44 pname = "nuspell";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ=";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig pandoc ];
14+ nativeBuildInputs = [ cmake pkg-config pandoc ];
1515 buildInputs = [ icu ];
1616
1717 outputs = [ "out" "lib" "dev" "man" ];
pkgs/development/libraries/ogrepaged/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }:
1+{ stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
22
33stdenv.mkDerivation rec {
44 pname = "ogre-paged";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 ];
2828
2929 buildInputs = [ ois ogre libX11 boost ];
30− nativeBuildInputs = [ cmake pkgconfig ];
30+ nativeBuildInputs = [ cmake pkg-config ];
3131
3232 cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ];
3333
pkgs/development/libraries/opencascade/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
2− pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
2+ pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
33 OpenCL, Cocoa
44}:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig";
1616 };
1717
18− nativeBuildInputs = [ cmake ninja pkgconfig ];
18+ nativeBuildInputs = [ cmake ninja pkg-config ];
1919 buildInputs = [
2020 libGL libGLU libXmu freetype fontconfig expat freeimage vtk
2121 gl2ps tbb
pkgs/development/libraries/opencolorio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, boost, pkgconfig, lcms2, tinyxml, git }:
1+{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }:
22
33with lib;
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 outputs = [ "bin" "out" "dev" ];
1717
1818 # TODO: Investigate whether git can be dropped: It's only used to apply patches
19− nativeBuildInputs = [ cmake pkgconfig git ];
19+ nativeBuildInputs = [ cmake pkg-config git ];
2020
2121 buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost;
2222
pkgs/development/libraries/openct/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1
22, doxygen, libxslt
33}:
44
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 "--sysconfdir=/etc"
2626 ];
2727
28− nativeBuildInputs = [ autoreconfHook pkgconfig ];
28+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2929 buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ];
3030
3131 preInstall = ''
pkgs/development/libraries/opencv/3.x.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub, fetchpatch
3−, cmake, pkgconfig, unzip, zlib, pcre, hdf5
3+, cmake, pkg-config, unzip, zlib, pcre, hdf5
44, glog, boost, gflags, protobuf
55, config
66
@@ -206,7 +206,7 @@ stdenv.mkDerivation {
206206
207207 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
208208
209− nativeBuildInputs = [ cmake pkgconfig unzip ];
209+ nativeBuildInputs = [ cmake pkg-config unzip ];
210210
211211 NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
212212
pkgs/development/libraries/opencv/4.x.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv
22, fetchurl, fetchFromGitHub, fetchpatch
3−, cmake, pkgconfig, unzip, zlib, pcre, hdf5
3+, cmake, pkg-config, unzip, zlib, pcre, hdf5
44, glog, boost, gflags, protobuf
55, config
66
@@ -216,7 +216,7 @@ stdenv.mkDerivation {
216216
217217 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
218218
219− nativeBuildInputs = [ cmake pkgconfig unzip ];
219+ nativeBuildInputs = [ cmake pkg-config unzip ];
220220
221221 NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
222222
pkgs/development/libraries/opencv/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unzip
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip
22, zlib
33, enablePython ? false, pythonPackages
44, enableGtk2 ? false, gtk2
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757
5858 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
5959
60− nativeBuildInputs = [ cmake pkgconfig unzip ];
60+ nativeBuildInputs = [ cmake pkg-config unzip ];
6161
6262 NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
6363
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
7171
7272 hardeningDisable = [ "bindnow" "relro" ];
7373
74− # Fix pkgconfig file that gets broken with multiple outputs
74+ # Fix pkg-config file that gets broken with multiple outputs
7575 postFixup = ''
7676 sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|"
7777 sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|"
pkgs/development/libraries/opendkim/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter
1+{ stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter
22, autoreconfHook, perl, makeWrapper }:
33
44stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 "ac_cv_func_realloc_0_nonnull=yes"
1717 ];
1818
19− nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
19+ nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
2020
2121 buildInputs = [ libbsd openssl libmilter perl ];
2222
pkgs/development/libraries/openjpeg/generic.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, fetchFromGitHub, cmake, pkg-config
22, libpng, libtiff, lcms2, jpylyzer
33, mj2Support ? true # MJ2 executables
44, jpwlLibSupport ? true # JPWL library & executables
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
5454 (mkFlag testsSupport "BUILD_TESTING")
5555 ] ++ extraFlags;
5656
57− nativeBuildInputs = [ cmake pkgconfig ];
57+ nativeBuildInputs = [ cmake pkg-config ];
5858
5959 buildInputs = [ ]
6060 ++ optionals jpipServerSupport [ curl fcgi ]
pkgs/development/libraries/opensaml-cpp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoreconfHook, pkgconfig
1+{ stdenv, fetchgit, autoreconfHook, pkg-config
22, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib
33}:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs = [
1616 boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib
1717 ];
18− nativeBuildInputs = [ autoreconfHook pkgconfig ];
18+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1919
2020 configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
2121
pkgs/development/libraries/openscenegraph/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen,
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
22 libX11, libXinerama, libXrandr, libGLU, libGL,
33 glib, ilmbase, libxml2, pcre, zlib,
44 AGL, Carbon, Cocoa, Foundation,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785";
3737 };
3838
39− nativeBuildInputs = [ pkgconfig cmake doxygen ];
39+ nativeBuildInputs = [ pkg-config cmake doxygen ];
4040
4141 buildInputs = [
4242 libX11 libXinerama libXrandr libGLU libGL
pkgs/development/libraries/openwsman/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, fetchFromGitHub, cmake, pkg-config
22, curl, libxml2, pam, sblim-sfcc }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 buildInputs = [ curl libxml2 pam sblim-sfcc ];
1818
pkgs/development/libraries/openzwave/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which
2+, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which
33, systemd }:
44
55let
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
1818 sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1";
1919 };
2020
21− nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ];
21+ nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ];
2222
2323 buildInputs = [ systemd ];
2424
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
4848 --replace dir= dir=$out
4949
5050 substituteInPlace $out/bin/ozw_config \
51− --replace pcfile=${pkgconfig} pcfile=$out
51+ --replace pcfile=${pkg-config} pcfile=$out
5252 '';
5353
5454 meta = with stdenv.lib; {
pkgs/development/libraries/osm-gps-map/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
1+{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, stdenv }:
22
33stdenv.mkDerivation rec {
44 pname = "osm-gps-map";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 outputs = [ "out" "dev" "doc" ];
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [
1717 cairo glib gobject-introspection
pkgs/development/libraries/p11-kit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which
1+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which
22, gettext, libffi, libiconv, libtasn1
33}:
44
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 # at the same time, libtasn1 in buildInputs provides the libasn1 library
2222 # to link against for the target platform.
2323 # hence, libtasn1 is required in both native and build inputs.
24− nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ];
24+ nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ];
2525 buildInputs = [ gettext libffi libiconv libtasn1 ];
2626
2727 autoreconfPhase = ''
pkgs/development/libraries/pango/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz
1+{ stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz
22, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3
33, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
44, meson, ninja, glib
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
2424 nativeBuildInputs = [
2525 meson ninja
2626 glib # for glib-mkenum
27− pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
27+ pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
2828 ];
2929 buildInputs = [
3030 fribidi
pkgs/development/libraries/pangolin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew
1+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
22, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen
33, Carbon ? null, Cocoa ? null
44}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0";
1616 };
1717
18− nativeBuildInputs = [ cmake pkgconfig doxygen ];
18+ nativeBuildInputs = [ cmake pkg-config doxygen ];
1919
2020 buildInputs = [
2121 libGL
pkgs/development/libraries/pangomm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3
1+{ stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3
22, ApplicationServices }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 outputs = [ "out" "dev" ];
1414
15− nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [
15+ nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin [
1616 ApplicationServices
1717 ];
1818 propagatedBuildInputs = [ pango glibmm cairomm ];
pkgs/development/libraries/pangoxsl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, glib, pango}:
1+{stdenv, fetchurl, pkg-config, glib, pango}:
22
33stdenv.mkDerivation {
44 name = "pangoxsl-1.6.0.3";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n";
88 };
99
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [
1212 glib
1313 pango
pkgs/development/libraries/pcaudiolib/default.nix+2−2
@@ -1,5 +1,5 @@
11{ config, stdenv, lib, fetchFromGitHub
2−, autoconf, automake, which, libtool, pkgconfig
2+, autoconf, automake, which, libtool, pkg-config
33, portaudio, alsaLib
44, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
55
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0";
1515 };
1616
17− nativeBuildInputs = [ autoconf automake which libtool pkgconfig ];
17+ nativeBuildInputs = [ autoconf automake which libtool pkg-config ];
1818
1919 buildInputs = [ portaudio ]
2020 ++ lib.optionals stdenv.isLinux [ alsaLib ]
pkgs/development/libraries/pcl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake
2−, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
2+, qhull, flann, boost, vtk, eigen, pkg-config, qtbase
33, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL
44}:
55
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig cmake ];
16+ nativeBuildInputs = [ pkg-config cmake ];
1717 buildInputs = [ qhull flann boost eigen libusb1 libpcap
1818 libpng vtk qtbase libXt ]
1919 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ];
pkgs/development/libraries/phash/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }:
1+{ stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }:
22
33stdenv.mkDerivation rec {
44 pname = "pHash";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 # at runtime
1111 propagatedBuildInputs = [ imagemagick ];
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"];
1616 postInstall = ''
pkgs/development/libraries/phonon/backends/gstreamer.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig
1+{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config
22, extra-cmake-modules, qttools, qtbase, qtx11extras
33, debug ? false
44}:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 gst-libav
3939 ]);
4040 in toString [
41− # This flag should be picked up through pkgconfig, but it isn't.
41+ # This flag should be picked up through pkg-config, but it isn't.
4242 "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
4343
4444 ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"''
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454
5555 nativeBuildInputs = [
5656 cmake
57− pkgconfig
57+ pkg-config
5858 extra-cmake-modules
5959 qttools
6060 ];
pkgs/development/libraries/phonon/backends/vlc.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc
1+{ stdenv, lib, fetchurl, cmake, phonon, pkg-config, libvlc
22, extra-cmake-modules, qttools, qtbase, qtx11extras
33, debug ? false
44}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030
3131 nativeBuildInputs = [
3232 cmake
33− pkgconfig
33+ pkg-config
3434 qttools
3535 extra-cmake-modules
3636 ];
pkgs/development/libraries/phonon/default.nix+2−2
@@ -4,7 +4,7 @@
44, cmake
55, libGLU
66, libGL
7−, pkgconfig
7+, pkg-config
88, libpulseaudio
99, extra-cmake-modules
1010, qtbase
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646
4747 nativeBuildInputs = [
4848 cmake
49− pkgconfig
49+ pkg-config
5050 extra-cmake-modules
5151 ];
5252
pkgs/development/libraries/pipewire/0.2.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
1+{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind
22, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg
33, sbc, SDL2, makeFontsConf
44}:
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121 outputs = [ "out" "lib" "dev" "doc" ];
2222
2323 nativeBuildInputs = [
24− meson ninja pkgconfig doxygen graphviz valgrind
24+ meson ninja pkg-config doxygen graphviz valgrind
2525 ];
2626 buildInputs = [
2727 glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
pkgs/development/libraries/pipewire/default.nix+2−2
@@ -6,7 +6,7 @@
66, meson
77, ninja
88, systemd
9−, pkgconfig
9+, pkg-config
1010, doxygen
1111, graphviz
1212, valgrind
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
7575 graphviz
7676 meson
7777 ninja
78− pkgconfig
78+ pkg-config
7979 ];
8080
8181 buildInputs = [
pkgs/development/libraries/pixman/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }:
1+{ stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }:
22
33stdenv.mkDerivation rec {
44 pname = "pixman";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ libpng ];
1515
pkgs/development/libraries/pkcs11helper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
1+{ stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "pkcs11-helper";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1515 buildInputs = [ openssl ];
1616
1717 enableParallelBuilding = true;
pkgs/development/libraries/pmdk/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, autoconf, libndctl, pkgconfig
2+, autoconf, libndctl, pkg-config
33}:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i";
1414 };
1515
16− nativeBuildInputs = [ autoconf pkgconfig ];
16+ nativeBuildInputs = [ autoconf pkg-config ];
1717 buildInputs = [ libndctl ];
1818 enableParallelBuilding = true;
1919
pkgs/development/libraries/pocketsphinx/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, sphinxbase
4−, pkgconfig
4+, pkg-config
55, python27 # >= 2.6
66, swig2 # 2.0
77}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 propagatedBuildInputs = [ sphinxbase ];
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ python27 swig2 ];
2121
2222 meta = {
pkgs/development/libraries/poco/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
1+{ stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
22
33stdenv.mkDerivation rec {
44 pname = "poco";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz";
1111 };
1212
13− nativeBuildInputs = [ cmake pkgconfig ];
13+ nativeBuildInputs = [ cmake pkg-config ];
1414
1515 buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
1616
pkgs/development/libraries/podofo/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
2−, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch
2+, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch
33}:
44
55stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 outputs = [ "out" "dev" "lib" ];
2424
25− nativeBuildInputs = [ cmake pkgconfig ];
25+ nativeBuildInputs = [ cmake pkg-config ];
2626
2727 buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng
2828 libidn expat lua5 ];
pkgs/development/libraries/polkit-qt-1/qt-4.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib, qt4 }:
1+{ stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
22
33with stdenv.lib;
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212
1313 outputs = [ "out" "dev" ];
1414
15− nativeBuildInputs = [ cmake pkgconfig automoc4 ];
15+ nativeBuildInputs = [ cmake pkg-config automoc4 ];
1616
1717 propagatedBuildInputs = [ polkit glib qt4 ];
1818
pkgs/development/libraries/polkit-qt-1/qt-5.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }:
1+{ stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
22
33with stdenv.lib;
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 propagatedBuildInputs = [ polkit glib qtbase ];
1818
pkgs/development/libraries/polkit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch
1+{ stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch
22, intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
33, docbook_xml_dtd_412, gtk-doc, coreutils
44, useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
5252 outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
5353
5454 nativeBuildInputs =
55− [ glib gtk-doc pkgconfig intltool perl ]
55+ [ glib gtk-doc pkg-config intltool perl ]
5656 ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
5757 buildInputs =
5858 [ expat pam spidermonkey_78 ]
pkgs/development/libraries/poly2tri-c/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, glib
66}:
77
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [
2222 autoreconfHook
23− pkgconfig
23+ pkg-config
2424 ];
2525
2626 buildInputs = [
pkgs/development/libraries/poppler/0.61.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
1+{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl
22, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
33, withData ? true, poppler_data
44, qt5Support ? false, qtbase ? null
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 ++ optional qt5Support qtbase
4040 ++ optional introspectionSupport gobject-introspection;
4141
42− nativeBuildInputs = [ cmake ninja pkgconfig ];
42+ nativeBuildInputs = [ cmake ninja pkg-config ];
4343
4444 # Not sure when and how to pass it. It seems an upstream bug anyway.
4545 CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
pkgs/development/libraries/poppler/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl
1+{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl
22, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
33, withData ? true, poppler_data
44, qt5Support ? false, qtbase ? null
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 ++ optional utils nss
3232 ++ optional introspectionSupport gobject-introspection;
3333
34− nativeBuildInputs = [ cmake ninja pkgconfig ];
34+ nativeBuildInputs = [ cmake ninja pkg-config ];
3535
3636 # Workaround #54606
3737 preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
pkgs/development/libraries/portaudio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2
1+{ stdenv, fetchurl, alsaLib, pkg-config, libjack2
22, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
33
44stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libjack2 ]
1414 ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
1515
pkgs/development/libraries/protobufc/generic.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, src, version
2−, autoreconfHook, pkgconfig, protobuf, zlib
2+, autoreconfHook, pkg-config, protobuf, zlib
33, ...
44}:
55
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99
1010 inherit src;
1111
12− nativeBuildInputs = [ autoreconfHook pkgconfig ];
12+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1313 buildInputs = [ protobuf zlib ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/pslib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff
1+{ stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff
22}:
33
44stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig ];
14+ nativeBuildInputs = [ cmake pkg-config ];
1515 buildInputs = [ zlib libpng libjpeg libungif libtiff ];
1616
1717 doCheck = true;
pkgs/development/libraries/qca-qt5/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }:
1+{ stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
22
33stdenv.mkDerivation rec {
44 pname = "qca-qt5";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ openssl qtbase ];
13− nativeBuildInputs = [ cmake pkgconfig ];
13+ nativeBuildInputs = [ cmake pkg-config ];
1414
1515 # Without this patch cmake fails with a "No known features for CXX compiler"
1616 # error on darwin
pkgs/development/libraries/qca2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, cmake, pkgconfig, qt, darwin }:
1+{ stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }:
22
33stdenv.mkDerivation rec {
44 pname = "qca";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
1010 };
1111
12− nativeBuildInputs = [ cmake pkgconfig ];
12+ nativeBuildInputs = [ cmake pkg-config ];
1313 buildInputs = [ openssl qt ]
1414 ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
1515
pkgs/development/libraries/qgnomeplatform/default.nix+2−2
@@ -2,7 +2,7 @@
22, lib
33, fetchFromGitHub
44, nix-update-script
5−, pkgconfig
5+, pkg-config
66, gtk3
77, glib
88, qtbase
@@ -33,7 +33,7 @@ mkDerivation rec {
3333 ];
3434
3535 nativeBuildInputs = [
36− pkgconfig
36+ pkg-config
3737 qmake
3838 ];
3939
pkgs/development/libraries/qrencode/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }:
1+{ stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "qrencode";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4=";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
1616
1717 configureFlags = [
pkgs/development/libraries/qt-4.x/4.8/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, lib, fetchurl, fetchpatch, substituteAll
22, libXrender, libXinerama, libXcursor, libXv, libXext
33, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
4−, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
4+, libmng, which, libGLU, openssl, dbus, cups, pkg-config
55, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
66, alsaLib
77, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -199,7 +199,7 @@ stdenv.mkDerivation rec {
199199 ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
200200 ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
201201
202− nativeBuildInputs = [ perl pkgconfig which ];
202+ nativeBuildInputs = [ perl pkg-config which ];
203203
204204 enableParallelBuilding = true;
205205
pkgs/development/libraries/qt-5/modules/qtbase.nix+2−2
@@ -2,7 +2,7 @@
22 stdenv, lib,
33 src, patches, version, qtCompatVersion,
44
5− coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3,
5+ coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3,
66 which,
77 # darwin support
88 darwin, libiconv,
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
8787 ++ lib.optional (postgresql != null) postgresql;
8888
8989 nativeBuildInputs =
90− [ bison flex gperf lndir perl pkgconfig which ];
90+ [ bison flex gperf lndir perl pkg-config which ];
9191
9292 propagatedNativeBuildInputs = [ lndir ];
9393
pkgs/development/libraries/qt-5/modules/qtgamepad.nix+2−2
@@ -1,9 +1,9 @@
1−{ qtModule, qtbase, qtdeclarative, pkgconfig }:
1+{ qtModule, qtbase, qtdeclarative, pkg-config }:
22
33qtModule {
44 name = "qtgamepad";
55 qtInputs = [ qtbase qtdeclarative ];
66 buildInputs = [ ];
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 outputs = [ "out" "dev" "bin" ];
99}
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix+2−2
@@ -1,4 +1,4 @@
1−{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig
1+{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config
22, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
33}:
44
@@ -7,7 +7,7 @@ with stdenv.lib;
77qtModule {
88 name = "qtmultimedia";
99 qtInputs = [ qtbase qtdeclarative ];
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
1212 ++ optional (stdenv.isLinux) alsaLib
1313 ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
pkgs/development/libraries/qt-5/modules/qtwayland.nix+2−2
@@ -1,9 +1,9 @@
1−{ qtModule, qtbase, qtquickcontrols, wayland, pkgconfig }:
1+{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
22
33qtModule {
44 name = "qtwayland";
55 qtInputs = [ qtbase qtquickcontrols ];
66 buildInputs = [ wayland ];
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 outputs = [ "out" "dev" "bin" ];
99}
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+2−2
@@ -1,7 +1,7 @@
11{ qtModule
22, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
33
4−, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
4+, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
55
66, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
77, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
@@ -24,7 +24,7 @@ qtModule {
2424 name = "qtwebengine";
2525 qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
2626 nativeBuildInputs = [
27− bison coreutils flex git gperf ninja pkgconfig python2 which gn
27+ bison coreutils flex git gperf ninja pkg-config python2 which gn
2828 ] ++ optional stdenv.isDarwin xcbuild;
2929 doCheck = true;
3030 outputs = [ "bin" "dev" "out" ];
pkgs/development/libraries/qt-5/modules/qtwebkit.nix+2−2
@@ -2,7 +2,7 @@
22, qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
33, fontconfig, gtk2, libwebp, libxml2, libxslt
44, sqlite, systemd, glib, gst_all_1, cmake
5−, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby
5+, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby
66, darwin
77, flashplayerFix ? false
88}:
@@ -31,7 +31,7 @@ qtModule {
3131 ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ])
3232 ++ optional usingAnnulenWebkitFork hyphen;
3333 nativeBuildInputs = [
34− bison flex gdb gperf perl pkgconfig python2 ruby
34+ bison flex gdb gperf perl pkg-config python2 ruby
3535 ] ++ optional usingAnnulenWebkitFork cmake;
3636
3737 cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]
pkgs/development/libraries/qtkeychain/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null
22, withQt5 ? false, qtbase ? null, qttools ? null
33, darwin ? null
44, libsecret
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
2525
2626 nativeBuildInputs = [ cmake ]
27− ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret
27+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
2828 ;
2929
3030 buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ]
pkgs/development/libraries/qtstyleplugins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }:
1+{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
22
33mkDerivation {
44 name = "qtstyleplugins-2017-03-11";
@@ -12,7 +12,7 @@ mkDerivation {
1212
1313 patches = [ ./fix-build-against-Qt-5.15.patch ];
1414
15− nativeBuildInputs = [ pkgconfig qmake ];
15+ nativeBuildInputs = [ pkg-config qmake ];
1616 buildInputs = [ gtk2 ];
1717
1818 meta = with stdenv.lib; {
pkgs/development/libraries/qtutilities/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkgconfig }:
1+{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "qtutilities";
pkgs/development/libraries/raft-canonical/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libuv }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }:
22
33stdenv.mkDerivation rec {
44 pname = "raft-canonical";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook file pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook file pkg-config ];
1515 buildInputs = [ libuv ];
1616
1717 preConfigure = ''
pkgs/development/libraries/rapidjson/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }:
1+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }:
22
33stdenv.mkDerivation rec {
44 pname = "rapidjson";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig cmake ];
14+ nativeBuildInputs = [ pkg-config cmake ];
1515
1616 preConfigure = ''
1717 substituteInPlace CMakeLists.txt --replace "-Werror" ""
pkgs/development/libraries/rarian/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
1+{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
22let
33 pname = "rarian";
44 version = "0.8.1";
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
1010 sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libxml2 libxslt ]
1515 ++ (with perlPackages; [ perl XMLParser ]);
1616 configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
pkgs/development/libraries/rdkafka/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
1+{ stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "rdkafka";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ zlib perl python openssl ];
1717
pkgs/development/libraries/rep-gtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
1+{ stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }:
22
33with stdenv.lib;
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1616 buildInputs = [ ];
1717 propagatedBuildInputs = [ librep gtk2 ];
1818
pkgs/development/libraries/resolv_wrapper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig }:
1+{ stdenv, fetchurl, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "resolv_wrapper-1.1.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa";
99 };
1010
11− nativeBuildInputs = [ cmake pkgconfig ];
11+ nativeBuildInputs = [ cmake pkg-config ];
1212
1313 meta = with stdenv.lib; {
1414 description = "A wrapper for the user, group and hosts NSS API";
pkgs/development/libraries/rubberband/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw
1+{ stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw
22, vamp-plugin-sdk, ladspaH }:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ];
1515
1616 meta = with stdenv.lib; {
pkgs/development/libraries/sbc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libsndfile }:
1+{ stdenv, fetchurl, pkg-config, libsndfile }:
22
33stdenv.mkDerivation rec {
44 name = "sbc-1.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ libsndfile ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/libraries/schroedinger/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }:
1+{ stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }:
22
33stdenv.mkDerivation {
44 name = "schroedinger-1.0.11";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 outputs = [ "out" "dev" "devdoc" ];
1212
13− nativeBuildInputs = [ pkgconfig autoreconfHook ];
13+ nativeBuildInputs = [ pkg-config autoreconfHook ];
1414 buildInputs = [ orc ];
1515
1616 doCheck = (!stdenv.isDarwin);
pkgs/development/libraries/science/math/blas/default.nix+1−1
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}"
4545 ln -s libblas.so.${version} "$out/lib/libblas.so.3"
4646 ln -s libblas.so.${version} "$out/lib/libblas.so"
47− # Write pkgconfig alias.
47+ # Write pkg-config alias.
4848 # See also openblas/default.nix
4949 mkdir $out/lib/pkgconfig
5050 cat <<EOF > $out/lib/pkgconfig/blas.pc
pkgs/development/libraries/science/math/brial/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, boost
66, m4ri
77, gd
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 nativeBuildInputs = [
3535 autoreconfHook
36− pkgconfig
36+ pkg-config
3737 ];
3838
3939 meta = with stdenv.lib; {
pkgs/development/libraries/science/math/fenics/default.nix+2−2
@@ -233,8 +233,8 @@ let
233233 export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH
234234 substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11"
235235 substituteInPlace dolfin/jit/jit.py \
236− --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
237− --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
236+ --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
237+ --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
238238 '';
239239 buildInputs = [
240240 dolfin
pkgs/development/libraries/science/math/osi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, gfortran, pkgconfig
1+{ stdenv, lib, fetchurl, gfortran, pkg-config
22, blas, zlib, bzip2
33, withGurobi ? false, gurobi
44, withCplex ? false, cplex }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 [ blas zlib bzip2 ]
1717 ++ lib.optional withGurobi gurobi
1818 ++ lib.optional withCplex cplex;
19− nativeBuildInputs = [ gfortran pkgconfig ];
19+ nativeBuildInputs = [ gfortran pkg-config ];
2020 configureFlags =
2121 lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ]
2222 ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ];
pkgs/development/libraries/science/math/tensorflow/bin.nix+1−1
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
5050 chmod -R +w $out
5151 ${patchLibs}
5252
53− # Write pkgconfig file.
53+ # Write pkg-config file.
5454 mkdir $out/lib/pkgconfig
5555 cat > $out/lib/pkgconfig/tensorflow.pc << EOF
5656 Name: TensorFlow
pkgs/development/libraries/serd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, python3, wafHook }:
1+{ stdenv, fetchurl, pkg-config, python3, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "serd";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig python3 wafHook ];
12+ nativeBuildInputs = [ pkg-config python3 wafHook ];
1313
1414 meta = with stdenv.lib; {
1515 homepage = "http://drobilla.net/software/serd";
pkgs/development/libraries/serf/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
2−, pkgconfig, libiconv }:
2+, pkg-config, libiconv }:
33
44stdenv.mkDerivation rec {
55 name = "serf-1.3.9";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ];
12+ nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ];
1313 buildInputs = [ apr openssl aprutil zlib libiconv ]
1414 ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
1515
pkgs/development/libraries/shibboleth-sp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }:
1+{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }:
22
33stdenv.mkDerivation rec {
44 pname = "shibboleth-sp";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr";
1111 };
1212
13− nativeBuildInputs = [ autoreconfHook pkgconfig ];
13+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1414 buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ];
1515
1616 configureFlags = [
pkgs/development/libraries/silgraphite/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }:
1+{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }:
22
33stdenv.mkDerivation rec {
44 version = "2.3.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ freetype libXft pango fontconfig];
1414
1515 NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
pkgs/development/libraries/silgraphite/graphite2.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, freetype, cmake, python }:
1+{ stdenv, fetchurl, pkg-config, freetype, cmake, python }:
22
33stdenv.mkDerivation rec {
44 version = "1.3.14";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig cmake ];
13+ nativeBuildInputs = [ pkg-config cmake ];
1414 buildInputs = [ freetype ];
1515
1616 patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
pkgs/development/libraries/smpeg/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }:
1+{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 name = "smpeg-svn${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 buildInputs = [ SDL gtk2 libGLU libGL ];
2222
23− nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ];
23+ nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ];
2424
2525 preConfigure = ''
2626 touch NEWS AUTHORS ChangeLog
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 $out/include/smpeg/*.h
3737
3838 wrapProgram $out/bin/smpeg-config \
39− --prefix PATH ":" "${pkgconfig}/bin" \
39+ --prefix PATH ":" "${pkg-config}/bin" \
4040 --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
4141 '';
4242
pkgs/development/libraries/snack/default.nix+2−2
@@ -1,6 +1,6 @@
11# alsaLib vorbis-tools python can be made optional
22
3−{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }:
3+{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
44
55stdenv.mkDerivation {
66 name = "snack-2.2.10";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414
1515 postUnpack = ''sourceRoot="$sourceRoot/unix"'';
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ];
1919
2020 hardeningDisable = [ "format" ];
pkgs/development/libraries/socket_wrapper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig }:
1+{ stdenv, fetchurl, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "socket_wrapper-1.2.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx";
99 };
1010
11− nativeBuildInputs = [ cmake pkgconfig ];
11+ nativeBuildInputs = [ cmake pkg-config ];
1212
1313 meta = with stdenv.lib; {
1414 description = "A library passing all socket communications through unix sockets";
pkgs/development/libraries/sofia-sip/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }:
1+{ stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "sofia-sip";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [ glib openssl ];
15− nativeBuildInputs = [ autoreconfHook pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1616
1717 meta = with stdenv.lib; {
1818 description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
pkgs/development/libraries/soprano/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
2−, pkgconfig }:
2+, pkg-config }:
33
44stdenv.mkDerivation rec {
55 name = "soprano-2.9.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 # We disable the Java backend, since we do not need them and they make the closure size much bigger
1515 buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
1616
17− nativeBuildInputs = [ cmake pkgconfig ];
17+ nativeBuildInputs = [ cmake pkg-config ];
1818
1919 meta = {
2020 homepage = "http://soprano.sourceforge.net/";
pkgs/development/libraries/soqt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkgconfig }:
1+{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "soqt";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [ coin3d qtbase ];
1717
18− nativeBuildInputs = [ cmake pkgconfig ];
18+ nativeBuildInputs = [ cmake pkg-config ];
1919
2020 meta = with stdenv.lib; {
2121 homepage = "https://github.com/coin3d/soqt";
pkgs/development/libraries/sord/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }:
1+{ stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "sord";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig python3 wafHook ];
12+ nativeBuildInputs = [ pkg-config python3 wafHook ];
1313 buildInputs = [ pcre ];
1414 propagatedBuildInputs = [ serd ];
1515
pkgs/development/libraries/spatialite-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
1+{ stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
22
33stdenv.mkDerivation rec {
44 name = "spatialite-tools-4.1.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ];
1313
1414 configureFlags = [ "--disable-freexl" ];
pkgs/development/libraries/speechd/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, substituteAll
3−, pkgconfig
3+, pkg-config
44, fetchurl
55, python3Packages
66, gettext
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
5454 ];
5555
5656 nativeBuildInputs = [
57− pkgconfig
57+ pkg-config
5858 autoreconfHook
5959 gettext
6060 libtool
pkgs/development/libraries/speex/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }:
22
33stdenv.mkDerivation rec {
44 name = "speex-1.2.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 outputs = [ "out" "dev" "doc" ];
1616
17− nativeBuildInputs = [ autoreconfHook pkgconfig ];
17+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1818 buildInputs = [ fftw speexdsp ];
1919
2020 # TODO: Remove this will help with immediate backward compatability
pkgs/development/libraries/speexdsp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw }:
22
33stdenv.mkDerivation rec {
44 name = "speexdsp-1.2.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 outputs = [ "out" "dev" "doc" ];
1515
16− nativeBuildInputs = [ autoreconfHook pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1717 buildInputs = [ fftw ];
1818
1919 configureFlags = [
pkgs/development/libraries/sphinxbase/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchurl
33, bison
4−, pkgconfig
4+, pkg-config
55, python27 # >= 2.6
66, swig2 # 2.0
77, multipleOutputs ? false #Uses incomplete features of nix!
@@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
1515 sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ swig2 python27 bison ];
2020
2121 meta = {
pkgs/development/libraries/spice-gtk/default.nix+2−2
@@ -23,7 +23,7 @@
2323, perl
2424, phodav
2525, pixman
26−, pkgconfig
26+, pkg-config
2727, polkit
2828, python3
2929, spice-protocol
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
8181 meson
8282 ninja
8383 perl
84− pkgconfig
84+ pkg-config
8585 python3
8686 python3.pkgs.pyparsing
8787 python3.pkgs.six
pkgs/development/libraries/spice/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchurl
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
66, pixman
77, alsaLib
88, openssl
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646 nativeBuildInputs = [
4747 meson
4848 ninja
49− pkgconfig
49+ pkg-config
5050 spice-protocol
5151 python3
5252 python3.pkgs.six
pkgs/development/libraries/srtp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig
1+{ stdenv, fetchFromGitHub, pkg-config
22, openssl ? null, libpcap ? null
33}:
44
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 outputs = [ "out" "dev" ];
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020
2121 # libsrtp.pc references -lcrypto -lpcap without -L
2222 propagatedBuildInputs = [ openssl libpcap ];
pkgs/development/libraries/startup-notification/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}:
1+{stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}:
22
33let
44 version = "0.12";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libX11 libxcb xcbutil ];
1616
1717 meta = {
pkgs/development/libraries/subunit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }:
1+{ stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }:
22
33# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ check cppunit perl pythonPackages.wrapPython ];
1616
1717 propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
pkgs/development/libraries/svrcore/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, nss, nspr }:
1+{ stdenv, fetchurl, pkg-config, nss, nspr }:
22
33stdenv.mkDerivation rec {
44 pname = "svrcore";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ nss nspr ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/sword/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }:
1+{ stdenv, fetchurl, pkg-config, icu, clucene_core, curl }:
22
33stdenv.mkDerivation rec {
44
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ icu clucene_core curl ];
1515
1616 prePatch = ''
pkgs/development/libraries/taglib-sharp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }:
22
33stdenv.mkDerivation rec {
44 pname = "taglib-sharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig autoreconfHook which ];
14+ nativeBuildInputs = [ pkg-config autoreconfHook which ];
1515 buildInputs = [ mono ];
1616
1717 dontStrip = true;
pkgs/development/libraries/telepathy/farstream/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }:
1+{ stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }:
22
33stdenv.mkDerivation rec {
44 name = "${pname}-0.6.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
pkgs/development/libraries/telepathy/glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt
1+{ stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
22, gobject-introspection, vala, glibcLocales }:
33
44stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 LC_ALL = "en_US.UTF-8";
1818 propagatedBuildInputs = [ dbus-glib glib ];
1919
20− nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ];
20+ nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
2121 buildInputs = [ glibcLocales python2 ];
2222
2323 enableParallelBuilding = true;
pkgs/development/libraries/telepathy/qt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus
1+{ stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
22, telepathy-farstream, telepathy-glib, fetchpatch }:
33
44let
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig python ];
14+ nativeBuildInputs = [ cmake pkg-config python ];
1515 propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
1616 buildInputs = [ dbus-glib ];
1717 checkInputs = [ dbus.daemon dbus-python ];
pkgs/development/libraries/template-glib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
1+{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
22let
33 version = "3.34.0";
44 pname = "template-glib";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1";
1414 };
1515
16− buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
16+ buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
1717 nativeBuildInputs = [ glib gobject-introspection ];
1818
1919 mesonFlags = [
pkgs/development/libraries/thrift/0.10.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison
1+{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
22, flex, twisted
33}:
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
1818 pythonPath = [];
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [
2222 boost zlib libevent openssl python bison flex twisted
2323 ];
pkgs/development/libraries/thrift/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig
1+{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config
22, bison, flex, twisted
33, static ? stdenv.hostPlatform.isStatic
44}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 # pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
2626 pythonPath = [];
2727
28− nativeBuildInputs = [ cmake pkgconfig bison flex ];
28+ nativeBuildInputs = [ cmake pkg-config bison flex ];
2929 buildInputs = [ boost zlib libevent openssl ]
3030 ++ stdenv.lib.optionals (!static) [ python twisted ];
3131
pkgs/development/libraries/timezonemap/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, autoreconfHook
33, fetchbzr
4−, pkgconfig
4+, pkg-config
55, gtk3
66, glib
77, file
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 };
2222
2323 nativeBuildInputs = [
24− pkgconfig
24+ pkg-config
2525 autoreconfHook
2626 gobject-introspection
2727 ];
pkgs/development/libraries/tinyxml/2.6.2.nix+1−1
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
1313 };
1414
1515 patches = [
16− # add pkgconfig file
16+ # add pkg-config file
1717 ./2.6.2-add-pkgconfig.patch
1818
1919 # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
pkgs/development/libraries/tk/generic.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? []
1+{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? []
22, enableAqua ? stdenv.isDarwin, darwin
33, ... }:
44
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
3131 ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"
3232 ++ stdenv.lib.optional enableAqua "--enable-aqua";
3333
34− nativeBuildInputs = [ pkgconfig ];
34+ nativeBuildInputs = [ pkg-config ];
3535 buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
3636
3737 propagatedBuildInputs = [ tcl libXft ];
pkgs/development/libraries/tokyo-tyrant/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, tokyocabinet, pkgconfig }:
1+{ fetchurl, stdenv, tokyocabinet, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "tokyotyrant-1.1.41";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ tokyocabinet ];
1313
1414 doCheck = false; # FIXME
pkgs/development/libraries/totem-pl-parser/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }:
1+{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "totem-pl-parser";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616 };
1717
18− nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
18+ nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ];
1919 buildInputs = [ libxml2 ];
2020
2121 meta = with stdenv.lib; {
pkgs/development/libraries/tracker-miners/default.nix+2−2
@@ -11,7 +11,7 @@
1111, tracker
1212, meson
1313, ninja
14−, pkgconfig
14+, pkg-config
1515, vala
1616, wrapGAppsHook
1717, bzip2
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
6464 libxslt
6565 meson
6666 ninja
67− pkgconfig
67+ pkg-config
6868 vala
6969 wrapGAppsHook
7070 ];
pkgs/development/libraries/tracker/default.nix+3−3
@@ -4,7 +4,7 @@
44, gettext
55, meson
66, ninja
7−, pkgconfig
7+, pkg-config
88, asciidoc
99, gobject-introspection
1010, python3
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 meson
5858 ninja
5959 vala
60− pkgconfig
60+ pkg-config
6161 asciidoc
6262 gettext
6363 libxslt
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
6868 docbook_xml_dtd_45
6969 python3 # for data-generators
7070 systemd # used for checks to install systemd user service
71− dbus # used for checks and pkgconfig to install dbus service/s
71+ dbus # used for checks and pkg-config to install dbus service/s
7272 ];
7373
7474 buildInputs = [
pkgs/development/libraries/tremor/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }:
1+{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }:
22
33stdenv.mkDerivation {
44 name = "tremor-unstable-2018-03-16";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 outputs = [ "out" "dev" ];
1515
16− nativeBuildInputs = [ autoreconfHook pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1717 propagatedBuildInputs = [ libogg ];
1818
1919 preConfigure = ''
pkgs/development/libraries/twolame/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, autoreconfHook, pkgconfig
2+, autoreconfHook, pkg-config
33, libsndfile }:
44
55stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x";
1515 };
1616
17− nativeBuildInputs = [ autoreconfHook pkgconfig ];
17+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1818 buildInputs = [ libsndfile ];
1919
2020 doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found"
pkgs/development/libraries/uci/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, cmake, fetchgit, pkgconfig, libubox }:
1+{ stdenv, cmake, fetchgit, pkg-config, libubox }:
22
33stdenv.mkDerivation {
44 pname = "uci";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 hardeningDisable = [ "all" ];
1414 cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
1515 buildInputs = [ libubox ];
16− nativeBuildInputs = [ cmake pkgconfig ];
16+ nativeBuildInputs = [ cmake pkg-config ];
1717
1818 meta = with stdenv.lib; {
1919 description = "OpenWrt Unified Configuration Interface";
pkgs/development/libraries/ucommon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig
1+{ stdenv, fetchurl, pkg-config
22, openssl ? null, zlib ? null, gnutls ? null
33}:
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121
2222 # disable flaky networking test
2323 postPatch = ''
pkgs/development/libraries/uhttpmock/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }:
1+{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 version="0.5.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ];
1616
1717 preConfigure = "./autogen.sh";
pkgs/development/libraries/uid_wrapper/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig }:
1+{ stdenv, fetchurl, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 name = "uid_wrapper-1.2.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf";
99 };
1010
11− nativeBuildInputs = [ cmake pkgconfig ];
11+ nativeBuildInputs = [ cmake pkg-config ];
1212
1313 meta = with stdenv.lib; {
1414 description = "A wrapper for the user, group and hosts NSS API";
pkgs/development/libraries/unibilium/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
1+{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }:
22
33stdenv.mkDerivation rec {
44 pname = "unibilium-unstable";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 makeFlags = [ "PREFIX=$(out)" ]
1616 ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
1717
18− nativeBuildInputs = [ pkgconfig perl ];
18+ nativeBuildInputs = [ pkg-config perl ];
1919 buildInputs = [ libtool ncurses ];
2020
2121 meta = with lib; {
pkgs/development/libraries/unicorn/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchFromGitHub
3−, pkgconfig
3+, pkg-config
44, cmake
55}:
66
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig cmake ];
18+ nativeBuildInputs = [ pkg-config cmake ];
1919
2020 meta = with stdenv.lib; {
2121 description = "Lightweight multi-platform CPU emulator library";
pkgs/development/libraries/usbredir/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libusb1 }:
1+{ stdenv, fetchurl, pkg-config, libusb1 }:
22
33stdenv.mkDerivation rec {
44 pname = "usbredir";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 NIX_CFLAGS_COMPILE = "-Wno-error";
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 propagatedBuildInputs = [ libusb1 ];
1616
1717 outputs = [ "out" "dev" ];
pkgs/development/libraries/v8/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchgit, fetchFromGitHub
2−, gn, ninja, python, glib, pkgconfig, icu
2+, gn, ninja, python, glib, pkg-config, icu
33, xcbuild, darwin
44, fetchpatch
55}:
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
101101 # to be exceeded
102102 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
103103
104− nativeBuildInputs = [ gn ninja pkgconfig python ]
104+ nativeBuildInputs = [ gn ninja pkg-config python ]
105105 ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
106106 buildInputs = [ glib icu ];
107107
pkgs/development/libraries/v8/plv8_6_x.nix+2−2
@@ -4,7 +4,7 @@
44# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which
55# is a bit outdated. plv8 3.x is planned to support v8 7.x
66
7−{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
7+{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config
88, doCheck ? false
99, snapshot ? true
1010}:
@@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
158158 use_custom_libcxx_for_host=false
159159 '';
160160
161− nativeBuildInputs = [ gn ninja pkgconfig ];
161+ nativeBuildInputs = [ gn ninja pkg-config ];
162162 buildInputs = [ python glib ];
163163
164164 buildPhase = ''
pkgs/development/libraries/vaapi-intel-hybrid/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }:
1+{ stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
22
33stdenv.mkDerivation rec {
44 pname = "intel-hybrid-driver";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 })
1818 ];
1919
20− nativeBuildInputs = [ autoreconfHook pkgconfig ];
20+ nativeBuildInputs = [ autoreconfHook pkg-config ];
2121
2222 buildInputs = [ cmrt libdrm libva libX11 libGL wayland ];
2323
pkgs/development/libraries/vaapi-vdpau/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkgconfig }:
1+{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "libva-vdpau-driver";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; })
2525 ];
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828 buildInputs = [ libvdpau libGLU libGL libva ];
2929
3030 postPatch = ''
pkgs/development/libraries/vapoursynth-mvtools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
1+{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook,
22 vapoursynth, nasm, fftwFloat
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [
1818 autoreconfHook
1919 nasm vapoursynth fftwFloat
pkgs/development/libraries/vapoursynth/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper
1+{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
22, zimg, libass, python3, libiconv
33, ApplicationServices
44, ocrSupport ? false, tesseract ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4";
2222 };
2323
24− nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ];
24+ nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ];
2525 buildInputs = [
2626 zimg libass
2727 (python3.withPackages (ps: with ps; [ sphinx cython ]))
pkgs/development/libraries/vcdimager/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt
1+{ stdenv, lib, fetchurl, pkg-config, libcdio, libxml2, popt
22, libiconv, darwin }:
33
44stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 buildInputs = [ libxml2 popt libiconv ]
1515 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]);
pkgs/development/libraries/virglrenderer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3
1+{ stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3
22, libGLU, epoxy, libX11, libdrm, mesa
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ libGLU epoxy libX11 libdrm mesa ];
1515
16− nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ];
16+ nativeBuildInputs = [ cmake meson ninja pkg-config python3 ];
1717
1818 dontUseCmakeConfigure = true;
1919
pkgs/development/libraries/vmime/default.nix+2−2
@@ -1,5 +1,5 @@
11{stdenv, fetchFromGitHub
2−, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3
2+, gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3
33# this will not work on non-nixos systems
44, sendmailPath ? "/run/wrappers/bin/sendmail"
55}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ];
18− nativeBuildInputs = [ pkgconfig cmake ];
18+ nativeBuildInputs = [ pkg-config cmake ];
1919
2020 cmakeFlags = [
2121 "-DVMIME_SENDMAIL_PATH=${sendmailPath}"
pkgs/development/libraries/vmmlib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack
22, Accelerate, CoreGraphics, CoreVideo
33}:
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 ./disable-cpack.patch #disable the need of cpack/rpm
1818 ];
1919
20− nativeBuildInputs = [ pkgconfig cmake ];
20+ nativeBuildInputs = [ pkg-config cmake ];
2121 buildInputs = [ boost lapack ]
2222 ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
2323
pkgs/development/libraries/volume-key/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
1+{ stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3
22, ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme
33, autoconf, automake, libtool
44, buildPackages
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
1818
1919 outputs = [ "out" "man" "dev" "py" ];
2020
21− nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ];
21+ nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig ];
2222
2323 buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ];
2424
pkgs/development/libraries/vte/2.90.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }:
1+{ stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 versionMajor = "0.36";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ];
1717
1818 configureFlags = [ "--enable-introspection" ];
pkgs/development/libraries/vte/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchurl
44, fetchpatch
55, gettext
6−, pkgconfig
6+, pkg-config
77, meson
88, ninja
99, gnome3
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 libxml2
4545 meson
4646 ninja
47− pkgconfig
47+ pkg-config
4848 vala
4949 ];
5050
pkgs/development/libraries/vulkan-loader/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
1+{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config
22, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig cmake ];
15+ nativeBuildInputs = [ pkg-config cmake ];
1616 buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ];
1717
1818 preConfigure = ''
pkgs/development/libraries/wayland/default.nix+3−3
@@ -3,7 +3,7 @@
33, fetchurl
44, fetchpatch
55, meson
6−, pkgconfig
6+, pkg-config
77, substituteAll
88, ninja
99, libffi
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
5757 '';
5858
5959 depsBuildBuild = [
60− pkgconfig
60+ pkg-config
6161 ];
6262
6363 nativeBuildInputs = [
6464 meson
65− pkgconfig
65+ pkg-config
6666 ninja
6767 ] ++ lib.optionals isCross [
6868 wayland # For wayland-scanner during the build
pkgs/development/libraries/wayland/protocols.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig
1+{ lib, stdenv, fetchurl, pkg-config
22, wayland
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ wayland ];
1717
pkgs/development/libraries/waylandpp/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, cmake
4−, pkgconfig
4+, pkg-config
55, pugixml
66, wayland
77, libGL
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
3232 ];
3333
34− nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen;
34+ nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen;
3535 buildInputs = [ pugixml wayland libGL libffi ];
3636
3737 outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
pkgs/development/libraries/webkitgtk/default.nix+2−2
@@ -7,7 +7,7 @@
77, gperf
88, cmake
99, ninja
10−, pkgconfig
10+, pkg-config
1111, gettext
1212, gobject-introspection
1313, libnotify
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
9494 gperf
9595 ninja
9696 perl
97− pkgconfig
97+ pkg-config
9898 python3
9999 ruby
100100 glib # for gdbus-codegen
pkgs/development/libraries/wxSVG/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, pkgconfig, wxGTK
2+, pkg-config, wxGTK
33, ffmpeg_3, libexif
44, cairo, pango }:
55
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818
1919 propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ];
2020
pkgs/development/libraries/wxwidgets/2.8/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
1+{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
22, libX11, cairo
33, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
44, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]
2323 ++ optional withMesa libGLU;
2424
25− nativeBuildInputs = [ pkgconfig ];
25+ nativeBuildInputs = [ pkg-config ];
2626
2727 hardeningDisable = [ "format" ];
2828
pkgs/development/libraries/wxwidgets/2.9/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
1+{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
22, setfile
33, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
44, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
3636 ++ optional withMesa libGLU
3737 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
3838
39− nativeBuildInputs = [ pkgconfig ];
39+ nativeBuildInputs = [ pkg-config ];
4040
4141 propagatedBuildInputs = optional stdenv.isDarwin AGL;
4242
pkgs/development/libraries/wxwidgets/3.0/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
1+{ stdenv, fetchFromGitHub, fetchurl, pkg-config
22, libXinerama, libSM, libXxf86vm
33, gtk2, gtk3
44, xorgproto, gst_all_1, setfile
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 ++ optional withWebKit webkitgtk
3838 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
3939
40− nativeBuildInputs = [ pkgconfig ];
40+ nativeBuildInputs = [ pkg-config ];
4141
4242 propagatedBuildInputs = optional stdenv.isDarwin AGL;
4343
pkgs/development/libraries/wxwidgets/3.1/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, fetchurl
4−, pkgconfig
4+, pkg-config
55, libXinerama
66, libSM
77, libXxf86vm
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
6262 ++ optional withWebKit webkitgtk
6363 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
6464
65− nativeBuildInputs = [ pkgconfig ];
65+ nativeBuildInputs = [ pkg-config ];
6666
6767 propagatedBuildInputs = optional stdenv.isDarwin AGL;
6868
pkgs/development/libraries/xapian/tools/omega/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }:
1+{ stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
22
33stdenv.mkDerivation rec {
44 pname = "xapian-omega";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ xapian perl pcre zlib libmagic ];
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 meta = with stdenv.lib; {
1616 description = "Indexer and CGI search front-end built on Xapian library";
pkgs/development/libraries/xcb-util-cursor/HEAD.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
1+{ stdenv, fetchgit, autoconf, automake, libtool, pkg-config
22, xorg, gnum4, libxcb, gperf }:
33
44stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
2828 gperf
2929 libtool
3030 libxcb
31− pkgconfig
31+ pkg-config
3232 xorg.utilmacros
3333 xorg.xcbutilimage
3434 xorg.xcbutilrenderutil
pkgs/development/libraries/xdg-dbus-proxy/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, pkgconfig
3+, pkg-config
44, libxslt
55, docbook_xsl
66, docbook_xml_dtd_43
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 };
1919
2020 nativeBuildInputs = [
21− pkgconfig
21+ pkg-config
2222 libxslt
2323 docbook_xsl
2424 docbook_xml_dtd_43
pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, meson, ninja, pkgconfig, wayland-protocols
2+, meson, ninja, pkg-config, wayland-protocols
33, pipewire, wayland, elogind, systemd, libdrm }:
44
55stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc";
1414 };
1515
16− nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
16+ nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
1717 buildInputs = [ pipewire wayland elogind systemd libdrm ];
1818
1919 meta = with stdenv.lib; {
pkgs/development/libraries/xdg-desktop-portal/default.nix+2−2
@@ -3,7 +3,7 @@
33, nixosTests
44, substituteAll
55, autoreconfHook
6−, pkgconfig
6+, pkg-config
77, libxml2
88, glib
99, pipewire
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242
4343 nativeBuildInputs = [
4444 autoreconfHook
45− pkgconfig
45+ pkg-config
4646 libxml2
4747 wrapGAppsHook
4848 ];
pkgs/development/libraries/xine-lib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib
1+{ stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib
22, libvorbis, libtheora, speex, zlib, perl, ffmpeg_3
33, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
44, libmpcdec
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig perl ];
15+ nativeBuildInputs = [ pkg-config perl ];
1616
1717 buildInputs = [
1818 xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
pkgs/development/libraries/xml-security-c/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
1+{ stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "xml-security-c";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 "--with-xalan"
1616 ];
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ xalanc xercesc openssl ];
2020
2121 meta = {
pkgs/development/libraries/xml-tooling-c/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoreconfHook, pkgconfig
1+{ stdenv, fetchgit, autoreconfHook, pkg-config
22, boost, curl, openssl, log4shib, xercesc, xml-security-c
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
16− nativeBuildInputs = [ autoreconfHook pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1717
1818 enableParallelBuilding = true;
1919
pkgs/development/libraries/xmlsec/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool
1+{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool
22# nss_3_53 is used instead of the latest due to a number of issues:
33# https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss
44, openssl, nss_3_53, lib, runCommandCC, writeText }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
2525
2626 outputs = [ "out" "dev" ];
2727
28− nativeBuildInputs = [ pkgconfig ];
28+ nativeBuildInputs = [ pkg-config ];
2929
3030 buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ];
3131
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
5252
5353 passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test"
5454 {
55− nativeBuildInputs = [ pkgconfig ];
55+ nativeBuildInputs = [ pkg-config ];
5656 buildInputs = [ self libxml2 libxslt libtool ];
5757 } ''
5858 $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" ''
pkgs/development/libraries/yubico-pam/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config
22, asciidoc, libxslt, docbook_xsl
33, pam, yubikey-personalization, libyubikey, libykclient }:
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ];
1616 buildInputs = [ pam yubikey-personalization libyubikey libykclient ];
1717
1818 meta = with stdenv.lib; {
pkgs/development/libraries/zchunk/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, meson
66, ninja
77, zstd
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 nativeBuildInputs = [
2626 meson
2727 ninja
28− pkgconfig
28+ pkg-config
2929 ];
3030
3131 buildInputs = [
pkgs/development/libraries/zeitgeist/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitLab
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, glib
66, sqlite
77, gobject-introspection
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 autoconf
4545 automake
4646 libtool
47− pkgconfig
47+ pkg-config
4848 gettext
4949 gobject-introspection
5050 vala
pkgs/development/libraries/zmqpp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }:
22
33stdenv.mkDerivation rec {
44 pname = "zmqpp";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 outputs = [ "out" "dev" ];
1515
16− nativeBuildInputs = [ cmake pkgconfig ];
16+ nativeBuildInputs = [ cmake pkg-config ];
1717
1818 propagatedBuildInputs = [ zeromq ];
1919
pkgs/development/lua-modules/overrides.nix+1−1
@@ -108,7 +108,7 @@ with super;
108108
109109 lgi = super.lgi.override({
110110 nativeBuildInputs = [
111− pkgs.pkgconfig
111+ pkgs.pkg-config
112112 ];
113113 buildInputs = [
114114 pkgs.glib
pkgs/development/misc/yelp-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
1+{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "yelp-tools";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ];
2020
2121 doCheck = true;
pkgs/development/mobile/adbfs-rootless/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }:
22
33stdenv.mkDerivation rec {
44 pname = "adbfs-rootless";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 })
2020 ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [ fuse ];
2424
2525 postPatch = ''
pkgs/development/mobile/webos/novacom.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, webos, cmake, pkgconfig }:
1+{ lib, stdenv, fetchFromGitHub, webos, cmake, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "novacom";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n";
1212 };
1313
14− nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ];
14+ nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ];
1515
1616 postInstall = ''
1717 install -Dm755 -t $out/bin ../scripts/novaterm
pkgs/development/mobile/webos/novacomd.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv,
22fetchFromGitHub, fetchpatch,
3−webos, cmake, pkgconfig,
3+webos, cmake, pkg-config,
44libusb-compat-0_1 }:
55
66stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 })
2626 ];
2727
28− nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ];
28+ nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ];
2929
3030 buildInputs = [ libusb-compat-0_1 ];
3131
pkgs/development/node-packages/default.nix+1−1
@@ -225,7 +225,7 @@ let
225225 };
226226
227227 vega-cli = super.vega-cli.override {
228− nativeBuildInputs = [ pkgs.pkgconfig ];
228+ nativeBuildInputs = [ pkgs.pkg-config ];
229229 buildInputs = with pkgs; [
230230 super.node-pre-gyp
231231 pixman
pkgs/development/ocaml-modules/cairo2/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, buildDunePackage, ocaml
2−, pkgconfig, cairo
2+, pkg-config, cairo
33}:
44
55buildDunePackage rec {
@@ -11,7 +11,7 @@ buildDunePackage rec {
1111 sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ cairo ];
1616
1717 doCheck = !(stdenv.isDarwin
pkgs/development/ocaml-modules/ctypes/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }:
1+{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }:
22
33if !lib.versionAtLeast ocaml.version "4.02"
44then throw "ctypes is not available for OCaml ${ocaml.version}"
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ ocaml findlib ncurses ];
1818 propagatedBuildInputs = [ integers libffi ];
1919
pkgs/development/ocaml-modules/fontconfig/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }:
1+{ stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }:
22
33stdenv.mkDerivation {
44 name = "ocaml-fontconfig-20131103";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ ocaml fontconfig ];
1414 makeFlags = [
1515 "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/"
pkgs/development/ocaml-modules/gmetadom/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}:
1+{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}:
22
33let
44 pname = "gmetadom";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 '';
2323
2424
25− nativeBuildInputs = [ pkgconfig ];
25+ nativeBuildInputs = [ pkg-config ];
2626 buildInputs = [ocaml findlib gdome2 libxslt];
2727 propagatedBuildInputs = [gdome2];
2828
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
1+{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
22
33if lib.versionAtLeast ocaml.version "4.04"
44then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
1616 sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
2121
2222 configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
pkgs/development/ocaml-modules/lablgtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }:
1+{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }:
22
33let param =
44 let check = lib.versionAtLeast ocaml.version; in
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 pname = "lablgtk";
2424 inherit (param) version src;
2525
26− nativeBuildInputs = [ pkgconfig ];
26+ nativeBuildInputs = [ pkg-config ];
2727 buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ];
2828
2929 configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
pkgs/development/ocaml-modules/lablgtk3/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }:
1+{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }:
22
33buildDunePackage rec {
44 version = "3.1.1";
@@ -11,7 +11,7 @@ buildDunePackage rec {
1111 sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 propagatedBuildInputs = [ gtk3 cairo2 ];
1616
1717 meta = {
pkgs/development/ocaml-modules/lwt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
1+{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml
22, cppo, ocaml-migrate-parsetree, ocplib-endian, result
33, mmap, seq
44}:
@@ -14,7 +14,7 @@ buildDunePackage rec {
1414 sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [ cppo ocaml-migrate-parsetree ]
1919 ++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
2020 propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
pkgs/development/ocaml-modules/magick/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }:
1+{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }:
22
33if lib.versionAtLeast ocaml.version "4.06"
44then throw "magick is not available for OCaml ${ocaml.version}"
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q";
1212 };
1313
14− nativeBuildInputs = [ which pkgconfig ];
14+ nativeBuildInputs = [ which pkg-config ];
1515 buildInputs = [ ocaml findlib imagemagick ];
1616
1717 createFindlibDestdir = true;
pkgs/development/ocaml-modules/ocaml-cairo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
1+{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkg-config, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
22
33let
44 pname = "ocaml-cairo";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 patches = [ ./META.patch ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [ ocaml automake gnum4 autoconf unzip
2424 findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
2525
pkgs/development/ocaml-modules/ocamlnet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
1+{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip
22, gnutls, nettle
33}:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
2020
2121 createFindlibDestdir = true;
pkgs/development/ocaml-modules/ocamlsdl/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
1+{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
22
33let
44 pname = "ocamlsdl";
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
1717 sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl];
2222
23− propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ];
23+ propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ];
2424 createFindlibDestdir = true;
2525
2626 meta = {
pkgs/development/ocaml-modules/ocurl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
1+{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
22
33if lib.versionOlder ocaml.version "4.02"
44then throw "ocurl is not available for OCaml ${ocaml.version}"
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6";
1212 };
1313
14− buildInputs = [ pkgconfig ocaml findlib ncurses ];
14+ buildInputs = [ pkg-config ocaml findlib ncurses ];
1515 propagatedBuildInputs = [ curl lwt ];
1616 createFindlibDestdir = true;
1717 meta = {
pkgs/development/ocaml-modules/sqlite3/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }:
1+{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }:
22
33buildDunePackage rec {
44 pname = "sqlite3";
@@ -10,7 +10,7 @@ buildDunePackage rec {
1010 sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ sqlite ];
1515
1616 meta = with lib; {
pkgs/development/ocaml-modules/tsdl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }:
1+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }:
22
33if !lib.versionAtLeast ocaml.version "4.03"
44then throw "tsdl is not available for OCaml ${ocaml.version}"
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
1919 };
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222 buildInputs = [ ocaml findlib ocamlbuild topkg ];
2323 propagatedBuildInputs = [ SDL2 ctypes ];
2424
pkgs/development/ocaml-modules/zarith/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl
2−, ocaml, findlib, pkgconfig, perl
2+, ocaml, findlib, pkg-config, perl
33, gmp
44}:
55
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 inherit (source) version;
2222 src = fetchurl { inherit (source) url sha256; };
2323
24− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkg-config ];
2525 buildInputs = [ ocaml findlib perl ];
2626 propagatedBuildInputs = [ gmp ];
2727
pkgs/development/php-packages/event/default.nix+1−1
@@ -18,7 +18,7 @@ buildPecl {
1818 ':'
1919 '';
2020
21− nativeBuildInputs = [ pkgs.pkgconfig ];
21+ nativeBuildInputs = [ pkgs.pkg-config ];
2222 buildInputs = with pkgs; [ openssl libevent ];
2323 internalDeps = [ php.extensions.sockets ];
2424
pkgs/development/php-packages/imagick/default.nix+1−1
@@ -20,7 +20,7 @@ buildPecl {
2020 ];
2121
2222 configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ];
23− nativeBuildInputs = [ pkgs.pkgconfig ];
23+ nativeBuildInputs = [ pkgs.pkg-config ];
2424 buildInputs = [ pcre' ];
2525
2626 meta.maintainers = lib.teams.php.members;
pkgs/development/php-packages/memcached/default.nix+1−1
@@ -23,7 +23,7 @@ buildPecl {
2323 "--with-libmemcached-dir=${pkgs.libmemcached}"
2424 ];
2525
26− nativeBuildInputs = [ pkgs.pkgconfig ];
26+ nativeBuildInputs = [ pkgs.pkg-config ];
2727 buildInputs = with pkgs; [ cyrus_sasl zlib ];
2828
2929 meta.maintainers = lib.teams.php.members;
pkgs/development/php-packages/mongodb/default.nix+1−1
@@ -6,7 +6,7 @@ buildPecl {
66 version = "1.9.0";
77 sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
88
9− nativeBuildInputs = [ pkgs.pkgconfig ];
9+ nativeBuildInputs = [ pkgs.pkg-config ];
1010 buildInputs = with pkgs; [
1111 cyrus_sasl
1212 icu64
pkgs/development/php-packages/yaml/default.nix+1−1
@@ -8,7 +8,7 @@ buildPecl {
88
99 configureFlags = [ "--with-yaml=${pkgs.libyaml}" ];
1010
11− nativeBuildInputs = [ pkgs.pkgconfig ];
11+ nativeBuildInputs = [ pkgs.pkg-config ];
1212
1313 meta.maintainers = lib.teams.php.members;
1414}
pkgs/development/pure-modules/audio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }:
1+{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
22
33stdenv.mkDerivation rec {
44 baseName = "audio";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/avahi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, avahi }:
1+{ stdenv, fetchurl, pkg-config, pure, avahi }:
22
33stdenv.mkDerivation rec {
44 baseName = "avahi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure avahi ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/csv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "csv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/doc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "doc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ pure ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616
pkgs/development/pure-modules/fastcgi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, fcgi }:
1+{ stdenv, fetchurl, pkg-config, pure, fcgi }:
22
33stdenv.mkDerivation rec {
44 baseName = "fastcgi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure fcgi ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/faust/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }:
1+{ stdenv, fetchurl, pkg-config, pure, faust, libtool }:
22
33stdenv.mkDerivation rec {
44 baseName = "faust";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure faust libtool ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/ffi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, libffi }:
1+{ stdenv, fetchurl, pkg-config, pure, libffi }:
22
33stdenv.mkDerivation rec {
44 baseName = "ffi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure libffi ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/gen/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl,
2− pkgconfig, pure, haskellPackages }:
2+ pkg-config, pure, haskellPackages }:
33
44stdenv.mkDerivation rec {
55 baseName = "gen";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]);
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ hsEnv pure ];
1717 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1818
pkgs/development/pure-modules/gl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }:
1+{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
22
33stdenv.mkDerivation rec {
44 baseName = "gl";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ];
1515 makeFlags = [
1616 "libdir=${placeholder ''out''}/lib"
pkgs/development/pure-modules/glpk/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl,
2− pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
2+ pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
33
44stdenv.mkDerivation rec {
55 baseName = "glpk";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 "--with-gmp=yes" ];
2727 });
2828
29− nativeBuildInputs = [ pkgconfig ];
29+ nativeBuildInputs = [ pkg-config ];
3030 propagatedBuildInputs = [ pure glpkWithExtras ];
3131 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
3232 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/gplot/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, gnuplot }:
1+{ stdenv, fetchurl, pkg-config, pure, gnuplot }:
22
33stdenv.mkDerivation rec {
44 baseName = "gplot";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure gnuplot ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/gsl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pure, pkgconfig, gsl }:
1+{ stdenv, fetchurl, pure, pkg-config, gsl }:
22
33stdenv.mkDerivation rec {
44 baseName = "gsl";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure gsl ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/gtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }:
1+{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
22
33stdenv.mkDerivation rec {
44 baseName = "gtk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure pure-ffi gtk2 ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/liblo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, liblo }:
1+{ stdenv, fetchurl, pkg-config, pure, liblo }:
22
33stdenv.mkDerivation rec {
44 baseName = "liblo";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure liblo ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/lilv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }:
1+{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
22
33stdenv.mkDerivation rec {
44 baseName = "lilv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ];
1515 makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/lv2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, lv2 }:
1+{ stdenv, fetchurl, pkg-config, pure, lv2 }:
22
33stdenv.mkDerivation rec {
44 baseName = "lv2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure lv2 ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/midi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, portmidi }:
1+{ stdenv, fetchurl, pkg-config, pure, portmidi }:
22
33stdenv.mkDerivation rec {
44 baseName = "midi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure portmidi ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/mpfr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "mpfr";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/octave/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, octave }:
1+{ stdenv, fetchurl, pkg-config, pure, octave }:
22
33stdenv.mkDerivation rec {
44 baseName = "octave";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure octave ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/odbc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, libiodbc }:
1+{ stdenv, fetchurl, pkg-config, pure, libiodbc }:
22
33stdenv.mkDerivation rec {
44 baseName = "odbc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure libiodbc ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/pandoc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }:
1+{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
22
33stdenv.mkDerivation rec {
44 baseName = "pandoc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ pure ];
1515 propagatedBuildInputs = [ pandoc gawk getopt ];
1616 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
pkgs/development/pure-modules/rational/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "rational";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/readline/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, readline }:
1+{ stdenv, fetchurl, pkg-config, pure, readline }:
22
33stdenv.mkDerivation rec {
44 baseName = "readline";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure readline ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/sockets/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "sockets";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/sql3/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, sqlite }:
1+{ stdenv, fetchurl, pkg-config, pure, sqlite }:
22
33stdenv.mkDerivation rec {
44 baseName = "sql3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure sqlite ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/stldict/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "stldict";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 done
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 propagatedBuildInputs = [ pure ];
2121 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
2222 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/stllib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure }:
1+{ stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "stllib";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 done
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 propagatedBuildInputs = [ pure ];
2121 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
2222 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/tk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }:
1+{ stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
22
33stdenv.mkDerivation rec {
44 baseName = "tk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure tcl tk xlibsWrapper ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/pure-modules/xml/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }:
1+{ stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
22
33stdenv.mkDerivation rec {
44 baseName = "xml";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 propagatedBuildInputs = [ pure libxml2 libxslt ];
1515 makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
1616 setupHook = ../generic-setup-hook.sh;
pkgs/development/python-modules/av/default.nix+2−2
@@ -4,7 +4,7 @@
44, isPy27
55, numpy
66, ffmpeg
7−, pkgconfig
7+, pkg-config
88}:
99
1010buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
1919
2020 checkInputs = [ numpy ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [ ffmpeg ];
2424
2525 # Tests require downloading files from internet
pkgs/development/python-modules/dbus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
1+{ lib, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy
22, ncurses, pygobject3, isPy3k }:
33
44buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
1919
2020 disabled = isPyPy;
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [ dbus dbus-glib ]
2424 # My guess why it's sometimes trying to -lncurses.
2525 # It seems not to retain the dependency anyway.
pkgs/development/python-modules/fuse-python/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }:
1+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }:
22
33buildPythonPackage rec {
44 pname = "fuse-python";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 };
1111
1212 buildInputs = [ fuse ];
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 # no tests in the Pypi archive
1616 doCheck = false;
pkgs/development/python-modules/goocalendar/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchPypi
33, buildPythonPackage
4−, pkgconfig
4+, pkg-config
55, gtk3
66, gobject-introspection
77, pygtk
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 };
2525
2626 nativeBuildInputs = [
27− pkgconfig
27+ pkg-config
2828 gobject-introspection
2929 ];
3030
pkgs/development/python-modules/gphoto2/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchPypi, buildPythonPackage
2−, pkgconfig
2+, pkg-config
33, libgphoto2 }:
44
55buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111 sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ libgphoto2 ];
1717
pkgs/development/python-modules/gst-python/default.nix+2−2
@@ -3,7 +3,7 @@
33, meson
44, ninja
55, stdenv
6−, pkgconfig
6+, pkg-config
77, python3
88, pygobject3
99, gobject-introspection
@@ -30,7 +30,7 @@ buildPythonPackage rec {
3030 nativeBuildInputs = [
3131 meson
3232 ninja
33− pkgconfig
33+ pkg-config
3434 python3
3535 gobject-introspection
3636 gst-plugins-base
pkgs/development/python-modules/html5-parser/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }:
1+{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }:
22
33buildPythonPackage rec {
44 pname = "html5-parser";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ];
1414
1515 doCheck = false; # No such file or directory: 'run_tests.py'
pkgs/development/python-modules/imread/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, nose
5−, pkgconfig
5+, pkg-config
66, libjpeg
77, libpng
88, libtiff
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 };
2222
2323
24− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkg-config ];
2525 buildInputs = [ nose libjpeg libpng libtiff libwebp ];
2626 propagatedBuildInputs = [ numpy ];
2727
pkgs/development/python-modules/libasyncns/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, buildPythonPackage, fetchurl
2−, libasyncns, pkgconfig }:
2+, libasyncns, pkg-config }:
33
44buildPythonPackage rec {
55 pname = "libasyncns-python";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313 patches = [ ./libasyncns-fix-res-consts.patch ];
1414
1515 buildInputs = [ libasyncns ];
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 doCheck = false; # requires network access
1818
1919 meta = with lib; {
pkgs/development/python-modules/libversion/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }:
1+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }:
22
33buildPythonPackage rec {
44 pname = "libversion";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ libversion ];
1414
1515 disabled = pythonOlder "3.6";
pkgs/development/python-modules/libvirt/5.9.0.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
1+{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }:
22
33buildPythonPackage rec {
44 pname = "libvirt";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libvirt lxml ];
1515
1616 checkInputs = [ nose ];
pkgs/development/python-modules/libvirt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }:
1+{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }:
22
33buildPythonPackage rec {
44 pname = "libvirt";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111 sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00=";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ libvirt lxml ];
1616
1717 checkInputs = [ nose ];
pkgs/development/python-modules/llfuse/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
1+{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
22, contextlib2, osxfuse
33}:
44
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323 })
2424 ];
2525
26− nativeBuildInputs = [ pkgconfig ];
26+ nativeBuildInputs = [ pkg-config ];
2727 buildInputs =
2828 optionals stdenv.isLinux [ fuse ]
2929 ++ optionals stdenv.isDarwin [ osxfuse ];
pkgs/development/python-modules/matplotlib/2.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
22, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
3−, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
3+, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
44, fetchpatch
55, enableGhostscript ? false, ghostscript ? null, gtk3
66, enableGtk3 ? false, cairo
@@ -39,7 +39,7 @@ buildPythonPackage rec {
3939
4040 XDG_RUNTIME_DIR = "/tmp";
4141
42− nativeBuildInputs = [ pkgconfig ];
42+ nativeBuildInputs = [ pkg-config ];
4343
4444 buildInputs = [ which sphinx ]
4545 ++ stdenv.lib.optional enableGhostscript ghostscript
pkgs/development/python-modules/matplotlib/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
22, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
3−, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection
3+, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
44, certifi, pillow
55, enableGhostscript ? true, ghostscript ? null, gtk3
66, enableGtk3 ? false, cairo
@@ -32,7 +32,7 @@ buildPythonPackage rec {
3232
3333 XDG_RUNTIME_DIR = "/tmp";
3434
35− nativeBuildInputs = [ pkgconfig ];
35+ nativeBuildInputs = [ pkg-config ];
3636
3737 buildInputs = [ which sphinx ]
3838 ++ stdenv.lib.optional enableGhostscript ghostscript
pkgs/development/python-modules/poppler-qt5/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch
1+{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch
22, substituteAll
33}:
44
@@ -28,7 +28,7 @@ buildPythonPackage rec {
2828 ];
2929
3030 buildInputs = [ qtbase.dev poppler ];
31− nativeBuildInputs = [ pkgconfig ];
31+ nativeBuildInputs = [ pkg-config ];
3232 propagatedBuildInputs = [ sip pyqt5.dev ];
3333
3434 # no tests, just bindings for `poppler_qt5`
pkgs/development/python-modules/pyarrow/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
1+{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:
22
33let
44 _arrow-cpp = arrow-cpp.override { python3 = python; };
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212
1313 sourceRoot = "apache-arrow-${version}/python";
1414
15− nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
15+ nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ];
1616 propagatedBuildInputs = [ numpy six ];
1717 checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
1818
pkgs/development/python-modules/pyatspi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
1+{ lib, stdenv, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
22
33buildPythonPackage rec {
44 pname = "pyatspi";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414
1515 buildInputs = [
1616 at-spi2-core
pkgs/development/python-modules/pycangjie/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
1+{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie
22, sqlite, buildPythonPackage, cython
33}:
44
@@ -14,7 +14,7 @@ in buildPythonPackage {
1414 sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ];
17+ nativeBuildInputs = [ pkg-config libtool autoconf automake cython ];
1818 buildInputs = [ libcangjie sqlite ];
1919
2020 preConfigure = ''
pkgs/development/python-modules/pygobject/3.36.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
1+{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
22pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
33
44buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
1818 "-Dpython=python${if isPy3k then "3" else "2" }"
1919 ];
2020
21− nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
21+ nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
2222 buildInputs = [ glib gobject-introspection ]
2323 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
2424 propagatedBuildInputs = [ pycairo cairo ];
pkgs/development/python-modules/pygobject/3.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
1+{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
22pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
33
44buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616
1717 outputs = [ "out" "dev" ];
1818
19− nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
19+ nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
2020 buildInputs = [ glib gobject-introspection ]
2121 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
2222 propagatedBuildInputs = [ pycairo cairo ];
pkgs/development/python-modules/pygobject/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k, pythonAtLeast }:
1+{ stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:
22
33buildPythonPackage rec {
44 pname = "pygobject";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
1919
2020 configureFlags = [ "--disable-introspection" ];
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [ glib ];
2424
2525 # in a "normal" setup, pygobject and pygtk are installed into the
pkgs/development/python-modules/pygraphviz/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
2−, pkgconfig, doctest-ignore-unicode, mock, nose }:
2+, pkg-config, doctest-ignore-unicode, mock, nose }:
33
44buildPythonPackage rec {
55 pname = "pygraphviz";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313 extension = "zip";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717 buildInputs = [ graphviz ];
1818 checkInputs = [ doctest-ignore-unicode mock nose ];
1919
pkgs/development/python-modules/pygtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango
1+{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
22, buildPythonPackage, libglade ? null, isPy3k }:
33
44buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 })
2525 ];
2626
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828 buildInputs = [
2929 pango
3030 ] ++ stdenv.lib.optional (libglade != null) libglade;
pkgs/development/python-modules/pygtksourceview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
1+{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }:
22
33buildPythonPackage rec {
44 pname = "pygtksourceview";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212
1313 patches = [ ./codegendir.patch ];
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ];
1717
1818 meta = {
pkgs/development/python-modules/pyqt/4.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }:
1+{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:
22
33buildPythonPackage rec {
44 pname = "PyQt-x11-gpl";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
4242 "--verbose"
4343 ];
4444
45− nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ];
45+ nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
4646 buildInputs = [ qt4 dbus ];
4747
4848 propagatedBuildInputs = [ sip ];
pkgs/development/python-modules/pyqt/5.x.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, pythonPackages, pkgconfig
1+{ lib, pythonPackages, pkg-config
22, dbus
33, qmake, lndir
44, qtbase
@@ -41,7 +41,7 @@ in buildPythonPackage rec {
4141 outputs = [ "out" "dev" ];
4242
4343 nativeBuildInputs = [
44− pkgconfig
44+ pkg-config
4545 qmake
4646 lndir
4747 sip
pkgs/development/python-modules/pyqtwebengine/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, pythonPackages, pkgconfig
1+{ lib, pythonPackages, pkg-config
22, qmake, qtbase, qtsvg, qtwebengine
33, wrapQtAppsHook
44}:
@@ -27,7 +27,7 @@ in buildPythonPackage rec {
2727 outputs = [ "out" "dev" ];
2828
2929 nativeBuildInputs = [
30− pkgconfig
30+ pkg-config
3131 qmake
3232 sip
3333 qtbase
pkgs/development/python-modules/pysmbc/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, buildPythonPackage, fetchPypi
2−, samba, pkgconfig
2+, samba, pkg-config
33, setuptools }:
44
55buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212 sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ setuptools samba ];
1717
1818 meta = with lib; {
pkgs/development/python-modules/python-efl/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchurl
33, buildPythonPackage
4−, pkgconfig
4+, pkg-config
55, python
66, dbus-python
77, enlightenment
@@ -18,7 +18,7 @@ buildPythonPackage rec {
1818 sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r";
1919 };
2020
21− nativeBuildInputs = [ pkgconfig ];
21+ nativeBuildInputs = [ pkg-config ];
2222
2323 buildInputs = [ enlightenment.efl ];
2424
pkgs/development/python-modules/python-igraph/default.nix+2−2
@@ -1,5 +1,5 @@
11{ buildPythonPackage, fetchPypi, lib, isPy3k
2−, pkgconfig, igraph
2+, pkg-config, igraph
33, texttable }:
44
55buildPythonPackage rec {
@@ -7,7 +7,7 @@ buildPythonPackage rec {
77 version = "0.8.3";
88 disabled = !isPy3k; # fails to build
99
10− nativeBuildInputs = [ pkgconfig ];
10+ nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [ igraph ];
1212 propagatedBuildInputs = [ texttable ];
1313
pkgs/development/python-modules/python_openzwave/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
2−, pkgconfig
2+, pkg-config
33, systemd, libyaml, openzwave, cython, pyserial
44, six, pydispatcher, urwid }:
55
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515 extension = "zip";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ systemd libyaml openzwave cython ];
2020 propagatedBuildInputs = [ six urwid pydispatcher pyserial ];
2121
pkgs/development/python-modules/pythonnet/default.nix+2−2
@@ -6,7 +6,7 @@
66, pytest
77, pycparser
88, psutil
9−, pkgconfig
9+, pkg-config
1010, dotnetbuildhelpers
1111, clang
1212, glib
@@ -53,7 +53,7 @@ buildPythonPackage rec {
5353 pytest
5454 pycparser
5555
56− pkgconfig
56+ pkg-config
5757 dotnetbuildhelpers
5858 clang
5959
pkgs/development/python-modules/roboschool/default.nix+2−2
@@ -9,7 +9,7 @@
99, assimp
1010, gym
1111, bullet-roboschool
12−, pkgconfig
12+, pkg-config
1313, which
1414}:
1515
@@ -32,7 +32,7 @@ buildPythonPackage rec {
3232 ];
3333
3434 nativeBuildInputs = [
35− pkgconfig
35+ pkg-config
3636 qtbase # needs the `moc` tool
3737 which
3838 ];
pkgs/development/python-modules/secp256k1/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, pkgconfig
4+, pkg-config
55, pytest
66, pytestrunner
77, cffi
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 checkInputs = [ pytest pytestrunner ];
2222 propagatedBuildInputs = [ cffi secp256k1 ];
2323
pkgs/development/python-modules/sentencepiece/default.nix+2−2
@@ -1,14 +1,14 @@
11{ buildPythonPackage
22, stdenv
33, sentencepiece
4−, pkgconfig
4+, pkg-config
55}:
66
77buildPythonPackage rec {
88 pname = "sentencepiece";
99 inherit (sentencepiece) version src;
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ sentencepiece.dev ];
1313
1414 sourceRoot = "source/python";
pkgs/development/python-modules/sipsimple/default.nix+1−1
@@ -32,7 +32,7 @@ buildPythonPackage rec {
3232 export LD=$CC
3333 '';
3434
35− nativeBuildInputs = [ pkgs.pkgconfig ];
35+ nativeBuildInputs = [ pkgs.pkg-config ];
3636 buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ];
3737 propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];
3838
pkgs/development/python-modules/systemd/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }:
1+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }:
22
33buildPythonPackage rec {
44 pname = "systemd";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212 };
1313
1414 buildInputs = [ systemd ];
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 doCheck = false;
1818
pkgs/development/python-modules/virtkey/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
1+{ lib, buildPythonPackage, fetchurl, pkg-config, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
22
33let
44 majorVersion = "0.63";
@@ -12,7 +12,7 @@ in buildPythonPackage rec {
1212 sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ];
1818
pkgs/development/python-modules/wxPython/3.0.nix+2−2
@@ -6,7 +6,7 @@
66, libX11
77, wxGTK
88, wxmac
9−, pkgconfig
9+, pkg-config
1010, buildPythonPackage
1111, pyopengl
1212, isPy3k
@@ -35,7 +35,7 @@ buildPythonPackage rec {
3535
3636 hardeningDisable = [ "format" ];
3737
38− nativeBuildInputs = [ pkgconfig ]
38+ nativeBuildInputs = [ pkg-config ]
3939 ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
4040 ++ (lib.optionals stdenv.isDarwin [ wxmac ]);
4141
pkgs/development/python-modules/wxPython/4.0.nix+2−2
@@ -2,7 +2,7 @@
22, stdenv
33, buildPythonPackage
44, fetchPypi
5−, pkgconfig
5+, pkg-config
66, which
77, cairo
88, pango
@@ -34,7 +34,7 @@ buildPythonPackage rec {
3434
3535 doCheck = false;
3636
37− nativeBuildInputs = [ pkgconfig which doxygen ]
37+ nativeBuildInputs = [ pkg-config which doxygen ]
3838 ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]);
3939
4040 buildInputs = [ ncurses libintl ]
pkgs/development/python-modules/wxPython/4.1.nix+2−2
@@ -3,7 +3,7 @@
33, fetchPypi
44, buildPythonPackage
55, which
6−, pkgconfig
6+, pkg-config
77, python
88, isPy27
99, pyopengl
@@ -30,7 +30,7 @@ buildPythonPackage rec {
3030 # https://github.com/wxWidgets/Phoenix/issues/1316
3131 doCheck = false;
3232
33− nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];
33+ nativeBuildInputs = [ which doxygen wxGTK pkg-config ];
3434
3535 buildInputs = [
3636 wxGTK.gtk
pkgs/development/python-modules/zstd/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ lib, stdenv, pkgconfig, fetchPypi, buildPythonPackage
1+{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage
22, buildPackages
33, zstd, pytest }:
44
@@ -13,10 +13,10 @@ buildPythonPackage rec {
1313
1414 postPatch = ''
1515 substituteInPlace setup.py \
16− --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config"
16+ --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
1717 '';
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [ zstd ];
2121
2222 setupPyBuildFlags = [
pkgs/development/r-modules/default.nix+29−29
@@ -246,7 +246,7 @@ let
246246 Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
247247 Cardinal = [ pkgs.which ];
248248 chebpol = [ pkgs.fftw ];
249− ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
249+ ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ];
250250 cit = [ pkgs.gsl_1 ];
251251 curl = [ pkgs.curl.dev ];
252252 data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
@@ -257,7 +257,7 @@ let
257257 fftwtools = [ pkgs.fftw.dev ];
258258 Formula = [ pkgs.gmp ];
259259 gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ];
260− git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ];
260+ git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ];
261261 GLAD = [ pkgs.gsl_1 ];
262262 glpkAPI = [ pkgs.gmp pkgs.glpk ];
263263 gmp = [ pkgs.gmp.dev ];
@@ -279,7 +279,7 @@ let
279279 mvabund = [ pkgs.gsl_1 ];
280280 mwaved = [ pkgs.fftw.dev ];
281281 ncdf4 = [ pkgs.netcdf ];
282− nloptr = [ pkgs.nlopt pkgs.pkgconfig ];
282+ nloptr = [ pkgs.nlopt pkgs.pkg-config ];
283283 n1qn1 = [ pkgs.gfortran ];
284284 odbc = [ pkgs.unixODBC ];
285285 pander = [ pkgs.pandoc pkgs.which ];
@@ -330,7 +330,7 @@ let
330330 rtiff = [ pkgs.libtiff.dev ];
331331 runjags = [ pkgs.jags ];
332332 RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
333− rzmq = [ pkgs.zeromq pkgs.pkgconfig ];
333+ rzmq = [ pkgs.zeromq pkgs.pkg-config ];
334334 clustermq = [ pkgs.zeromq ];
335335 SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
336336 sdcTable = [ pkgs.gmp pkgs.glpk ];
@@ -386,42 +386,42 @@ let
386386 nat = [ pkgs.which ];
387387 nat_templatebrains = [ pkgs.which ];
388388 pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
389− clustermq = [ pkgs.pkgconfig ];
389+ clustermq = [ pkgs.pkg-config ];
390390 RMark = [ pkgs.which ];
391391 RPushbullet = [ pkgs.which ];
392392 RcppEigen = [ pkgs.libiconv ];
393393 RCurl = [ pkgs.curl.dev ];
394− R2SWF = [ pkgs.pkgconfig ];
394+ R2SWF = [ pkgs.pkg-config ];
395395 rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ];
396− RGtk2 = [ pkgs.pkgconfig ];
397− RProtoBuf = [ pkgs.pkgconfig ];
398− Rpoppler = [ pkgs.pkgconfig ];
399− XML = [ pkgs.pkgconfig ];
400− cairoDevice = [ pkgs.pkgconfig ];
401− chebpol = [ pkgs.pkgconfig ];
402− fftw = [ pkgs.pkgconfig ];
403− gdtools = [ pkgs.pkgconfig ];
396+ RGtk2 = [ pkgs.pkg-config ];
397+ RProtoBuf = [ pkgs.pkg-config ];
398+ Rpoppler = [ pkgs.pkg-config ];
399+ XML = [ pkgs.pkg-config ];
400+ cairoDevice = [ pkgs.pkg-config ];
401+ chebpol = [ pkgs.pkg-config ];
402+ fftw = [ pkgs.pkg-config ];
403+ gdtools = [ pkgs.pkg-config ];
404404 jqr = [ pkgs.jq.lib ];
405− kza = [ pkgs.pkgconfig ];
406− magick = [ pkgs.pkgconfig ];
407− mwaved = [ pkgs.pkgconfig ];
408− odbc = [ pkgs.pkgconfig ];
409− openssl = [ pkgs.pkgconfig ];
410− pdftools = [ pkgs.pkgconfig ];
411− sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
412− showtext = [ pkgs.pkgconfig ];
413− spate = [ pkgs.pkgconfig ];
414− stringi = [ pkgs.pkgconfig ];
415− sysfonts = [ pkgs.pkgconfig ];
416− systemfonts = [ pkgs.pkgconfig ];
417− tesseract = [ pkgs.pkgconfig ];
418− Cairo = [ pkgs.pkgconfig ];
405+ kza = [ pkgs.pkg-config ];
406+ magick = [ pkgs.pkg-config ];
407+ mwaved = [ pkgs.pkg-config ];
408+ odbc = [ pkgs.pkg-config ];
409+ openssl = [ pkgs.pkg-config ];
410+ pdftools = [ pkgs.pkg-config ];
411+ sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ];
412+ showtext = [ pkgs.pkg-config ];
413+ spate = [ pkgs.pkg-config ];
414+ stringi = [ pkgs.pkg-config ];
415+ sysfonts = [ pkgs.pkg-config ];
416+ systemfonts = [ pkgs.pkg-config ];
417+ tesseract = [ pkgs.pkg-config ];
418+ Cairo = [ pkgs.pkg-config ];
419419 CLVTools = [ pkgs.gsl ];
420420 JMcmprsk = [ pkgs.gsl ];
421421 mashr = [ pkgs.gsl ];
422422 hadron = [ pkgs.gsl ];
423423 AMOUNTAIN = [ pkgs.gsl ];
424− Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];
424+ Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ];
425425 tcltk2 = [ pkgs.tcl pkgs.tk ];
426426 tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];
427427 gridGraphics = [ pkgs.which ];
pkgs/development/tools/analysis/cargo-tarpaulin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }:
1+{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-tarpaulin";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
1212 };
1313
1414 nativeBuildInputs = [
15− pkgconfig
15+ pkg-config
1616 ];
1717 buildInputs = [ openssl ];
1818
pkgs/development/tools/analysis/kcov/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
1+{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
22
33stdenv.mkDerivation rec {
44 pname = "kcov";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 preConfigure = "patchShebangs src/bin-to-c-source.py";
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616
1717 buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
1818
pkgs/development/tools/analysis/panopticon/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
2−, pkgconfig, makeWrapper }:
2+, pkg-config, makeWrapper }:
33
44rustPlatform.buildRustPackage rec {
55 pname = "panopticon";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
1212 sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
1313 };
1414
15− nativeBuildInputs = [ cmake pkgconfig ];
15+ nativeBuildInputs = [ cmake pkg-config ];
1616 buildInputs = [ makeWrapper ];
1717 propagatedBuildInputs = with qt5; [
1818 qt5.qtbase
pkgs/development/tools/analysis/radare2/cutter.nix+3−3
@@ -1,6 +1,6 @@
11{ fetchFromGitHub, lib, mkDerivation
22# nativeBuildInputs
3−, qmake, pkgconfig
3+, qmake, pkg-config
44# Qt
55, qtbase, qtsvg, qtwebengine
66# buildInputs
@@ -30,12 +30,12 @@ mkDerivation rec {
3030 --replace "include(lib_radare2.pri)" ""
3131 '';
3232
33− nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
33+ nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ];
3434 propagatedBuildInputs = [ python3.pkgs.pyside2 ];
3535 buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
3636
3737 qmakeFlags = with python3.pkgs; [
38− "CONFIG+=link_pkgconfig"
38+ "CONFIG+=link_pkg-config"
3939 "PKGCONFIG+=r_core"
4040 # Leaving this enabled doesn't break build but generates errors
4141 # at runtime (to console) about being unable to load needed bits.
pkgs/development/tools/analysis/radare2/default.nix+2−2
@@ -1,6 +1,6 @@
11{stdenv, fetchFromGitHub
22, buildPackages
3−, pkgconfig
3+, pkg-config
44, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
55, libuv, file, libzip, xxHash
66, gtk2 ? null, vte ? null, gtkdialog ? null
@@ -78,7 +78,7 @@ let
7878 enableParallelBuilding = true;
7979 depsBuildBuild = [ buildPackages.stdenv.cc ];
8080
81− nativeBuildInputs = [ pkgconfig ];
81+ nativeBuildInputs = [ pkg-config ];
8282 buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
8383 ++ optional useX11 [ gtkdialog vte gtk2 ]
8484 ++ optional rubyBindings [ ruby ]
pkgs/development/tools/analysis/retdec/default.nix+2−2
@@ -9,7 +9,7 @@
99, autoconf
1010, automake
1111, libtool
12−, pkgconfig
12+, pkg-config
1313, bison
1414, flex
1515, groff
@@ -145,7 +145,7 @@ in stdenv.mkDerivation rec {
145145 autoconf
146146 automake
147147 libtool
148− pkgconfig
148+ pkg-config
149149 bison
150150 flex
151151 groff
pkgs/development/tools/analysis/smatch/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, sqlite, pkgconfig, perl
1+{ stdenv, fetchgit, sqlite, pkg-config, perl
22, buildllvmsparse ? true
33, buildc2xml ? true
44, llvm ? null, libxml2 ? null
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
1717 };
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020 buildInputs = [sqlite perl]
2121 ++ stdenv.lib.optional buildllvmsparse llvm
2222 ++ stdenv.lib.optional buildc2xml libxml2;
pkgs/development/tools/analysis/sparse/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, libxml2, llvm }:
1+{ fetchurl, stdenv, pkg-config, libxml2, llvm }:
22
33stdenv.mkDerivation rec {
44 name = "sparse-0.5.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g"
1313 '';
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ libxml2 llvm ];
1717 doCheck = true;
1818
pkgs/development/tools/build-managers/cmake/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig
1+{ stdenv, lib, fetchurl, pkg-config
22, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
33, buildPackages
44# darwin attributes
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747
4848 depsBuildBuild = [ buildPackages.stdenv.cc ];
4949
50− nativeBuildInputs = [ setupHook pkgconfig ];
50+ nativeBuildInputs = [ setupHook pkg-config ];
5151
5252 buildInputs = []
5353 ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
pkgs/development/tools/build-managers/conan/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, python3, fetchFromGitHub, git, pkgconfig }:
1+{ lib, python3, fetchFromGitHub, git, pkg-config }:
22
33# Note:
44# Conan has specific dependency demands; check
@@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec {
7272 ];
7373
7474 checkInputs = [
75− pkgconfig
75+ pkg-config
7676 git
7777 ] ++ (with newPython.pkgs; [
7878 codecov
pkgs/development/tools/build-managers/gnumake/4.2/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
1+{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
22
3−assert guileSupport -> ( pkgconfig != null && guile != null );
3+assert guileSupport -> ( pkg-config != null && guile != null );
44
55let
66 version = "4.2.1";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
2525 ./glibc-2.27-glob.patch
2626 ];
2727
28− nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
28+ nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
2929 buildInputs = stdenv.lib.optionals guileSupport [ guile ];
3030
3131 configureFlags = stdenv.lib.optional guileSupport "--with-guile"
pkgs/development/tools/build-managers/gnumake/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
1+{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
22
3−assert guileSupport -> ( pkgconfig != null && guile != null );
3+assert guileSupport -> ( pkg-config != null && guile != null );
44
55let
66 version = "4.3";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
2121 ./impure-dirs.patch
2222 ];
2323
24− nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
24+ nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
2525 buildInputs = stdenv.lib.optionals guileSupport [ guile ];
2626
2727 configureFlags = stdenv.lib.optional guileSupport "--with-guile"
pkgs/development/tools/build-managers/meson/default.nix+1−1
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
6363
6464 # 0.45 update enabled tests but they are failing
6565 doCheck = false;
66− # checkInputs = [ ninja pkgconfig ];
66+ # checkInputs = [ ninja pkg-config ];
6767 # checkPhase = "python ./run_project_tests.py";
6868
6969 postFixup = ''
pkgs/development/tools/build-managers/tup/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }:
1+{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:
22
33stdenv.mkDerivation rec {
44 pname = "tup";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616 buildInputs = [ fuse3 pcre ];
1717
1818 configurePhase = ''
pkgs/development/tools/cargo-web/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform
1+{ stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform
22, CoreServices, Security
33}:
44
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm";
1717
18− nativeBuildInputs = [ openssl perl pkgconfig ];
18+ nativeBuildInputs = [ openssl perl pkg-config ];
1919 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
2020
2121 meta = with stdenv.lib; {
pkgs/development/tools/chit/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl
1+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
22, darwin
33}:
44
@@ -17,7 +17,7 @@ buildRustPackage rec {
1717
1818 cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m";
1919
20− nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
20+ nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
2121 buildInputs = []
2222 ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
2323 ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
pkgs/development/tools/diesel-cli/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security
1+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security
22, sqliteSupport ? true, sqlite
33, postgresqlSupport ? true, postgresql
44, mysqlSupport ? true, mysql, zlib, libiconv
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
3939 cargoPatches = [ ./cargo-lock.patch ];
4040 cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
4141
42− nativeBuildInputs = [ pkgconfig ];
42+ nativeBuildInputs = [ pkg-config ];
4343 buildInputs = [ openssl ]
4444 ++ optional stdenv.isDarwin Security
4545 ++ optional (stdenv.isDarwin && mysqlSupport) libiconv
pkgs/development/tools/documentation/gnome-doc-utils/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3
1+{ stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
22, python2Packages }:
33
44python2Packages.buildPythonApplication rec {
@@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
1212 sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
1313 };
1414
15− nativeBuildInputs = [ intltool pkgconfig libxslt.dev ];
15+ nativeBuildInputs = [ intltool pkg-config libxslt.dev ];
1616 buildInputs = [ libxslt ];
1717
1818 configureFlags = [ "--disable-scrollkeeper" ];
pkgs/development/tools/drm_info/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub
22, libdrm, json_c, pciutils
3−, meson, ninja, pkgconfig
3+, meson, ninja, pkg-config
44}:
55
66stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f";
1515 };
1616
17− nativeBuildInputs = [ meson ninja pkgconfig ];
17+ nativeBuildInputs = [ meson ninja pkg-config ];
1818 buildInputs = [ libdrm json_c pciutils ];
1919
2020 meta = with stdenv.lib; {
pkgs/development/tools/flatpak-builder/default.nix+2−2
@@ -11,7 +11,7 @@
1111, gettext
1212, libxml2
1313, libxslt
14−, pkgconfig
14+, pkg-config
1515, xmlto
1616
1717, acl
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
6464 gettext
6565 libxml2
6666 libxslt
67− pkgconfig
67+ pkg-config
6868 xmlto
6969 ];
7070
pkgs/development/tools/fmbt/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper
1+{ stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
22, flex
33, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
44, tesseract, gts, libXtst
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp";
1515 };
1616
17− nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper
17+ nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
1818 python.pkgs.wrapPython ];
1919
2020 buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
pkgs/development/tools/git-series/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform
2−, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2
2+, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
33}:
44
55with rustPlatform;
@@ -36,7 +36,7 @@ buildRustPackage rec {
3636
3737 LIBGIT2_SYS_USE_PKG_CONFIG = true;
3838 LIBSSH2_SYS_USE_PKG_CONFIG = true;
39− nativeBuildInputs = [ cmake pkgconfig perl ];
39+ nativeBuildInputs = [ cmake pkg-config perl ];
4040 buildInputs = [ openssl zlib curl libgit2 libssh2 ];
4141
4242 postBuild = ''
pkgs/development/tools/glslviewer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
1+{ stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage
22, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
33, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook
44, Cocoa
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7";
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ];
18+ nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ];
1919 buildInputs = [
2020 glfw libGLU glfw libXrandr libXdamage
2121 libXext libXrender libXinerama libXcursor libXxf86vm
pkgs/development/tools/gnome-desktop-testing/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, glib
33, autoreconfHook
4−, pkgconfig
4+, pkg-config
55, systemd
66, fetchFromGitLab
77}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [
2222 autoreconfHook
23− pkgconfig
23+ pkg-config
2424 ];
2525
2626 buildInputs = [
pkgs/development/tools/godot/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor
1+{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor
22, libXinerama, libXrandr, libXrender, libpulseaudio ? null
33, libXi ? null, libXext, libXfixes, freetype, openssl
44, alsaLib, libGLU, zlib, yasm ? null }:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v";
2020 };
2121
22− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [ pkg-config ];
2323 buildInputs = [
2424 scons libX11 libXcursor libXinerama libXrandr libXrender
2525 libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
pkgs/development/tools/guile/g-wrap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
1+{ fetchurl, stdenv, guile, guile-lib, libffi, pkg-config, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "g-wrap";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 # Note: Glib support is optional, but it's quite useful (e.g., it's used by
1515 # Guile-GNOME).
pkgs/development/tools/halfempty/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }:
22
33stdenv.mkDerivation rec {
44 pname = "halfempty";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig util-linux ];
14+ nativeBuildInputs = [ pkg-config util-linux ];
1515 buildInputs = [ glib ];
1616
1717 enableParallelBuilding = true;
pkgs/development/tools/icestorm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, pkgconfig, libftdi1
2+, pkg-config, libftdi1
33, python3, pypy3
44
55# PyPy yields large improvements in build time and runtime performance, and
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk";
3030 };
3131
32− nativeBuildInputs = [ pkgconfig ];
32+ nativeBuildInputs = [ pkg-config ];
3333 buildInputs = [ passthru.pythonPkg libftdi1 ];
3434 makeFlags = [ "PREFIX=$(out)" ];
3535
pkgs/development/tools/icr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which
1+{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which
22, openssl, readline, libyaml, zlib }:
33
44crystal.buildCrystalPackage rec {
@@ -16,7 +16,7 @@ crystal.buildCrystalPackage rec {
1616
1717 buildInputs = [ libyaml openssl readline zlib ];
1818
19− nativeBuildInputs = [ makeWrapper pkgconfig which ];
19+ nativeBuildInputs = [ makeWrapper pkg-config which ];
2020
2121 # tests are failing due to our sandbox
2222 doCheck = false;
pkgs/development/tools/jo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}:
1+{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}:
22
33stdenv.mkDerivation rec {
44 pname = "jo";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 enableParallelBuilding = true;
1515
16− nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ];
16+ nativeBuildInputs = [ autoreconfHook pandoc pkg-config ];
1717
1818 meta = with stdenv.lib; {
1919 description = "A small utility to create JSON objects";
pkgs/development/tools/kafkacat/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }:
1+{ stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }:
22
33stdenv.mkDerivation rec {
44 pname = "kafkacat";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkg-config ];
1616
1717 buildInputs = [ zlib rdkafka yajl ];
1818
pkgs/development/tools/libsigrok/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
1+{ stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
22, libserialport, librevisa, doxygen, glibmm, python
33, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
44}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ libzip glib libusb1 libftdi1 check libserialport
2222 librevisa doxygen glibmm python
2323 ];
pkgs/development/tools/libsigrokdecode/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
1+{ stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
22
33stdenv.mkDerivation rec {
44 name = "libsigrokdecode-0.5.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ glib python3 libsigrok check ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/tools/mdk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, intltool, pkgconfig, glib }:
1+{ stdenv, fetchurl, intltool, pkg-config, glib }:
22
33stdenv.mkDerivation {
44 name = "gnu-mdk-1.3.0";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
66 url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz";
77 sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
88 };
9− nativeBuildInputs = [ pkgconfig ];
9+ nativeBuildInputs = [ pkg-config ];
1010 buildInputs = [ intltool glib ];
1111 postInstall = ''
1212 mkdir -p $out/share/emacs/site-lisp/
pkgs/development/tools/misc/autogen/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }:
1+{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
22
33stdenv.mkDerivation rec {
44 pname = "autogen";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 outputs = [ "bin" "dev" "lib" "out" "man" "info" ];
3434
3535 nativeBuildInputs = [
36− which pkgconfig perl autoreconfHook/*patches applied*/
36+ which pkg-config perl autoreconfHook/*patches applied*/
3737 ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
3838 # autogen needs a build autogen when cross-compiling
3939 buildPackages.buildPackages.autogen buildPackages.texinfo
pkgs/development/tools/misc/awf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig
1+{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config
22, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
1313 };
1414
15− nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
15+ nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
1616
1717 buildInputs = [ gtk2 gtk3 ];
1818
pkgs/development/tools/misc/babeltrace/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
1+{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
22
33stdenv.mkDerivation rec {
44 name = "babeltrace-1.5.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ glib libuuid popt elfutils ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/tools/misc/blackmagic/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub
2−, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig
2+, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
33, python, pythonPackages
44}:
55
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 };
2121
2222 nativeBuildInputs = [
23− gcc-arm-embedded pkgconfig
23+ gcc-arm-embedded pkg-config
2424 ];
2525
2626 buildInputs = [
pkgs/development/tools/misc/bsdbuild/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
1+{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }:
22
33stdenv.mkDerivation rec {
44 pname = "bsdbuild";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ perl mandoc ed ];
13− nativeBuildInputs = [ pkgconfig libtool gettext ];
13+ nativeBuildInputs = [ pkg-config libtool gettext ];
1414
1515 prePatch = ''
1616 #ignore unfamiliar flags
pkgs/development/tools/misc/coccinelle/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
1+{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "coccinelle";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 buildInputs = with ocamlPackages; [
1313 ocaml findlib menhir
1414 ocaml_pcre pycaml
15− python ncurses pkgconfig
15+ python ncurses pkg-config
1616 ];
1717
1818 doCheck = !stdenv.isDarwin;
pkgs/development/tools/misc/d-feet/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv
2−, pkgconfig
2+, pkg-config
33, fetchurl
44, meson
55, ninja
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
3131 itstool
3232 meson
3333 ninja
34− pkgconfig
34+ pkg-config
3535 python3
3636 wrapGAppsHook
3737 ];
pkgs/development/tools/misc/dfu-util/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, pkgconfig, libusb1 }:
1+{ stdenv, fetchurl, pkg-config, libusb1 }:
22
33stdenv.mkDerivation rec {
44 pname = "dfu-util";
55 version = "0.10";
66
7− nativeBuildInputs = [ pkgconfig ];
7+ nativeBuildInputs = [ pkg-config ];
88 buildInputs = [ libusb1 ];
99
1010 src = fetchurl {
pkgs/development/tools/misc/distcc/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand
1+{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
22, gcc, autoconf, automake, which, procps, libiberty_static
33, runtimeShell
44, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -17,8 +17,8 @@ let
1717 sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
1818 };
1919
20− nativeBuildInputs = [ pkgconfig ];
21− buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static];
20+ nativeBuildInputs = [ pkg-config ];
21+ buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
2222 preConfigure =
2323 ''
2424 export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
pkgs/development/tools/misc/eggdbus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }:
1+{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
22
33stdenv.mkDerivation rec {
44 name = "eggdbus-0.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ glib dbus dbus-glib ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/tools/misc/fujprog/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, cmake
4−, pkgconfig
4+, pkg-config
55, IOKit
66, libftdi1
77, libusb-compat-0_1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [
2222 cmake
23− pkgconfig
23+ pkg-config
2424 ];
2525
2626 buildInputs = [
pkgs/development/tools/misc/gdb/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, targetPackages
22
33# Build time
4−, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
4+, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
55
66# Run time
77, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 ./darwin-target-match.patch
4545 ];
4646
47− nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ];
47+ nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
4848
4949 buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ]
5050 ++ stdenv.lib.optional pythonSupport python3
pkgs/development/tools/misc/gob2/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }:
1+{ stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gob2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 # configure script looks for d-bus but it is only needed for tests
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ glib bison flex ];
1515
1616 passthru = {
pkgs/development/tools/misc/gpshell/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin
1+{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
22, makeWrapper
33}:
44
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ globalplatform pcsclite makeWrapper ];
1616
1717 postFixup = ''
pkgs/development/tools/misc/gtkdialog/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, gtk2, pkgconfig }:
1+{stdenv, fetchurl, gtk2, pkg-config }:
22
33stdenv.mkDerivation {
44 name = "gtkdialog-0.8.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ gtk2 ];
1313
1414 meta = {
pkgs/development/tools/misc/gtkperf/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, pkgconfig, libintl }:
1+{ stdenv, fetchurl, gtk2, pkg-config, libintl }:
22
33stdenv.mkDerivation {
44 name = "gtkperf-0.40.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99
1010 hardeningDisable = [ "format" ];
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ gtk2 libintl ];
1414
1515 # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db
pkgs/development/tools/misc/hydra-cli/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
1+{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "hydra-cli";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
1616 ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
1717
1818 nativeBuildInputs = [
19− pkgconfig
19+ pkg-config
2020 ];
2121
2222 meta = with stdenv.lib; {
pkgs/development/tools/misc/hydra/common.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
2−, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
2+, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
33, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
44, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
55, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
9292 gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
9393 ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
9494
95− nativeBuildInputs = [ autoreconfHook pkgconfig ];
95+ nativeBuildInputs = [ autoreconfHook pkg-config ];
9696
9797 configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
9898
pkgs/development/tools/misc/intel-gpu-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
1+{ stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev
22, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
33, procps, utilmacros, gtk-doc, openssl, peg, elfutils
44}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig utilmacros ];
15+ nativeBuildInputs = [ pkg-config utilmacros ];
1616 buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
1717 libXext libXv libXrandr glib bison libunwind python3 procps
1818 gtk-doc openssl peg elfutils ];
pkgs/development/tools/misc/kconfig-frontends/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }:
1+{ stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
22
33stdenv.mkDerivation rec {
44 basename = "kconfig-frontends";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
1515
1616 configureFlags = [
pkgs/development/tools/misc/lttng-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
1+{ stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
22
33stdenv.mkDerivation rec {
44 pname = "lttng-tools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313 buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
1414
1515 meta = with stdenv.lib; {
pkgs/development/tools/misc/lttv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
1+{ stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
22
33stdenv.mkDerivation rec {
44 name = "lttv-1.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ glib gtk2 popt babeltrace ];
1313
1414 meta = with stdenv.lib; {
pkgs/development/tools/misc/msitools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }:
1+{ stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "msitools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
1010 };
1111
12− nativeBuildInputs = [ intltool pkgconfig ];
12+ nativeBuildInputs = [ intltool pkg-config ];
1313 buildInputs = [ glib libgsf libuuid gcab bzip2 ];
1414
1515 passthru = {
pkgs/development/tools/misc/pkg-config/default.nix+1−1
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
77 version = "0.29.2";
88
99 src = fetchurl {
10− url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz";
10+ url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz";
1111 sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
1212 };
1313
pkgs/development/tools/misc/sccache/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
1+{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }:
22
33rustPlatform.buildRustPackage rec {
44 version = "0.2.14";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414
1515 cargoBuildFlags = [ "--features=all" ];
1616 nativeBuildInputs = [
17− pkgconfig cargo rustc
17+ pkg-config cargo rustc
1818 ];
1919 buildInputs = [
2020 openssl
pkgs/development/tools/misc/sysbench/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config
22, libmysqlclient, libaio
33}:
44
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
66 pname = "sysbench";
77 version = "1.0.20";
88
9− nativeBuildInputs = [ autoreconfHook pkgconfig ];
9+ nativeBuildInputs = [ autoreconfHook pkg-config ];
1010 buildInputs = [ libmysqlclient libaio ];
1111
1212 src = fetchFromGitHub {
pkgs/development/tools/misc/universal-ctags/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
22
33stdenv.mkDerivation {
44 pname = "universal-ctags";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn";
1212 };
1313
14− nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
14+ nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ];
1515 buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
1616
1717 # to generate makefile.in
pkgs/development/tools/misc/usb-modeswitch/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, pkgconfig, makeWrapper
1+{ stdenv, lib, fetchurl, pkg-config, makeWrapper
22, libusb1, tcl, util-linux, coreutils, bash }:
33
44stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 '';
3636
3737 buildInputs = [ libusb1 tcl ];
38− nativeBuildInputs = [ pkgconfig makeWrapper ];
38+ nativeBuildInputs = [ pkg-config makeWrapper ];
3939
4040 meta = with stdenv.lib; {
4141 description = "A mode switching tool for controlling 'multi-mode' USB devices";
pkgs/development/tools/nemiver/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchurl
33, fetchpatch
4−, pkgconfig
4+, pkg-config
55, gnome3
66, gtk3
77, libxml2
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 libxml2
3434 intltool
3535 itstool
36− pkgconfig
36+ pkg-config
3737 wrapGAppsHook
3838 ];
3939
pkgs/development/tools/ofono-phonesim/default.nix+2−2
@@ -2,7 +2,7 @@
22, mkDerivation
33, fetchgit
44, autoreconfHook
5−, pkgconfig
5+, pkg-config
66, qtbase
77}:
88
@@ -18,7 +18,7 @@ mkDerivation {
1818
1919 nativeBuildInputs = [
2020 autoreconfHook
21− pkgconfig
21+ pkg-config
2222 ];
2323
2424 buildInputs = [
pkgs/development/tools/osslsigncode/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, autoreconfHook
44, libgsf
5−, pkgconfig
5+, pkg-config
66, openssl
77, curl
88}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3";
1919 };
2020
21− nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
21+ nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ];
2222
2323 meta = with lib; {
2424 homepage = "https://github.com/mtrojnar/osslsigncode";
pkgs/development/tools/parsing/antlr/4.8.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, jre
2−, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
2+, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }:
33
44let
55 version = "4.8";
@@ -18,7 +18,7 @@ let
1818
1919 outputs = [ "out" "dev" "doc" ];
2020
21− nativeBuildInputs = [ cmake ninja pkgconfig ];
21+ nativeBuildInputs = [ cmake ninja pkg-config ];
2222 buildInputs = stdenv.lib.optional stdenv.isLinux libuuid
2323 ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
2424
pkgs/development/tools/parsing/hammer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }:
1+{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }:
22
33stdenv.mkDerivation {
44 pname = "hammer";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ glib python scons ];
1515
1616 meta = with lib; {
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+13−13
@@ -56,7 +56,7 @@ self: super:
5656 av = super.av.overridePythonAttrs (
5757 old: {
5858 nativeBuildInputs = old.nativeBuildInputs ++ [
59− pkgs.pkgconfig
59+ pkgs.pkg-config
6060 ];
6161 buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
6262 }
@@ -234,8 +234,8 @@ self: super:
234234 h5py = super.h5py.overridePythonAttrs (
235235 old:
236236 if old.format != "wheel" then rec {
237− nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
238− buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
237+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
238+ buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ];
239239 configure_flags = "--hdf5=${pkgs.hdf5}";
240240 postConfigure = ''
241241 ${self.python.executable} setup.py configure ${configure_flags}
@@ -386,7 +386,7 @@ self: super:
386386 );
387387
388388 libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: {
389− nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ];
389+ nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ];
390390 propagatedBuildInputs = [ pkgs.libvirt ];
391391 });
392392
@@ -421,7 +421,7 @@ self: super:
421421
422422 lxml = super.lxml.overridePythonAttrs (
423423 old: {
424− nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
424+ nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ];
425425 buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
426426 }
427427 );
@@ -452,7 +452,7 @@ self: super:
452452 ++ lib.optional stdenv.isDarwin [ Cocoa ];
453453
454454 nativeBuildInputs = old.nativeBuildInputs ++ [
455− pkgs.pkgconfig
455+ pkgs.pkg-config
456456 ];
457457
458458 postPatch = ''
@@ -637,7 +637,7 @@ self: super:
637637
638638 pillow = super.pillow.overridePythonAttrs (
639639 old: {
640− nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
640+ nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs;
641641 buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
642642 }
643643 );
@@ -706,7 +706,7 @@ self: super:
706706
707707 nativeBuildInputs = old.nativeBuildInputs ++ [
708708 self.cython
709− pkgs.pkgconfig
709+ pkgs.pkg-config
710710 pkgs.cmake
711711 ];
712712
@@ -755,7 +755,7 @@ self: super:
755755 nativeBuildInputs = old.nativeBuildInputs ++ [
756756 pkgs.meson
757757 pkgs.ninja
758− pkgs.pkgconfig
758+ pkgs.pkg-config
759759 ];
760760
761761 propagatedBuildInputs = old.propagatedBuildInputs ++ [
@@ -822,7 +822,7 @@ self: super:
822822
823823 pygobject = super.pygobject.overridePythonAttrs (
824824 old: {
825− nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
825+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
826826 buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
827827 }
828828 );
@@ -873,7 +873,7 @@ self: super:
873873 format = "other";
874874
875875 nativeBuildInputs = old.nativeBuildInputs ++ [
876− pkgs.pkgconfig
876+ pkgs.pkg-config
877877 pkgs.qt5.qmake
878878 pkgs.xorg.lndir
879879 pkgs.qt5.qtbase
@@ -1012,7 +1012,7 @@ self: super:
10121012
10131013 pyzmq = super.pyzmq.overridePythonAttrs (
10141014 old: {
1015− nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
1015+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
10161016 propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
10171017 }
10181018 );
@@ -1117,7 +1117,7 @@ self: super:
11171117 tables = super.tables.overridePythonAttrs (
11181118 old: {
11191119 HDF5_DIR = "${pkgs.hdf5}";
1120− nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
1120+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
11211121 propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
11221122 }
11231123 );
pkgs/development/tools/profiling/oprofile/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, buildPackages
2−, fetchurl, pkgconfig
2+, fetchurl, pkg-config
33, libbfd, popt, zlib, linuxHeaders, libiberty_static
44, withGUI ? false, qt4 ? null
55}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp"
2222 '';
2323
24− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkg-config ];
2525 buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ]
2626 ++ stdenv.lib.optionals withGUI [ qt4 ];
2727
pkgs/development/tools/profiling/sysprof/default.nix+2−2
@@ -10,7 +10,7 @@
1010, libxml2
1111, meson, ninja
1212, pango
13−, pkgconfig
13+, pkg-config
1414, polkit
1515, shared-mime-info
1616, systemd
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 libxml2
3737 meson
3838 ninja
39− pkgconfig
39+ pkg-config
4040 shared-mime-info
4141 wrapGAppsHook
4242 gnome3.adwaita-icon-theme
pkgs/development/tools/profiling/systemtap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper
1+{ fetchgit, pkg-config, gettext, runCommand, makeWrapper
22, elfutils, kernel, gnumake, python2, python2Packages
33}:
44
@@ -17,7 +17,7 @@ let
1717 pname = "systemtap";
1818 inherit version;
1919 src = fetchgit { inherit url rev sha256; };
20− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkg-config ];
2121 buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
2222 enableParallelBuilding = true;
2323 };
pkgs/development/tools/pxview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }:
1+{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }:
22
33stdenv.mkDerivation rec {
44 pname = "pxview";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]);
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkg-config ];
1313
1414 configureFlags = [ "--with-pxlib=${pxlib.out}" ];
1515
pkgs/development/tools/py-spy/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }:
1+{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "py-spy";
pkgs/development/tools/rtags/default.nix+2−2
@@ -1,9 +1,9 @@
1−{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
1+{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
22
33stdenv.mkDerivation rec {
44 pname = "rtags";
55 version = "2.38";
6− nativeBuildInputs = [ cmake pkgconfig ];
6+ nativeBuildInputs = [ cmake pkg-config ];
77 buildInputs = [ llvmPackages.llvm openssl emacs ]
88 ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
99 ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
pkgs/development/tools/rust/cargo-deny/default.nix+2−2
@@ -2,7 +2,7 @@
22, lib
33, rustPlatform
44, fetchFromGitHub
5−, perl, pkgconfig, openssl, Security, libiconv, curl
5+, perl, pkg-config, openssl, Security, libiconv, curl
66}:
77
88rustPlatform.buildRustPackage rec {
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
2020
2121 doCheck = false;
2222
23− nativeBuildInputs = [ perl pkgconfig ];
23+ nativeBuildInputs = [ perl pkg-config ];
2424
2525 buildInputs = [ openssl ]
2626 ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
pkgs/development/tools/rust/cargo-geiger/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub
2−, rustPlatform, pkgconfig, openssl
2+, rustPlatform, pkg-config, openssl
33# testing packages
44, cargo-insta
55# darwin dependencies
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
2424 '';
2525
2626 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
27− nativeBuildInputs = [ pkgconfig ];
27+ nativeBuildInputs = [ pkg-config ];
2828
2929 # FIXME: Use impure version of CoreFoundation because of missing symbols.
3030 # CFURLSetResourcePropertyForKey is defined in the headers but there's no
pkgs/development/tools/rust/cargo-generate/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-generate";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 buildInputs = [ openssl ]
1919 ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
pkgs/development/tools/rust/cargo-raze/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, rustPlatform
2−, pkgconfig, curl, libgit2, openssl, Security }:
2+, pkg-config, curl, libgit2, openssl, Security }:
33
44rustPlatform.buildRustPackage rec {
55 pname = "cargo-raze";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
1515
1616 cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c";
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ curl libgit2 openssl ]
2020 ++ stdenv.lib.optional stdenv.isDarwin Security;
2121
pkgs/development/tools/rust/cargo-udeps/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }:
1+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-udeps";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c";
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkg-config ];
1717
1818 buildInputs = [ openssl ]
1919 ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
pkgs/development/tools/rust/maturin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config
22, darwin }:
33
44let
@@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec {
1616
1717 cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
1818
19− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkg-config ];
2020
2121 buildInputs = [ gmp openssl ]
2222 ++ stdenv.lib.optional stdenv.isDarwin Security
pkgs/development/tools/rust/rustup/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, runCommand, patchelf
22, fetchFromGitHub, rustPlatform, makeWrapper
3−, pkgconfig, curl, zlib, Security, CoreServices }:
3+, pkg-config, curl, zlib, Security, CoreServices }:
44
55let
66 libPath = lib.makeLibraryPath [
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
2121
2222 cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig";
2323
24− nativeBuildInputs = [ makeWrapper pkgconfig ];
24+ nativeBuildInputs = [ makeWrapper pkg-config ];
2525
2626 buildInputs = [
2727 curl zlib
pkgs/development/tools/scaff/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }:
1+{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "scaff";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
1414
1515 cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx";
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkg-config ];
1818 buildInputs = [ openssl ];
1919
2020 meta = with lib; {
pkgs/development/tools/sigrok-cli/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
1+{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }:
22
33stdenv.mkDerivation rec {
44 name = "sigrok-cli-0.7.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m";
99 };
1010
11− nativeBuildInputs = [ pkgconfig ];
11+ nativeBuildInputs = [ pkg-config ];
1212 buildInputs = [ glib libsigrok libsigrokdecode ];
1313
1414 meta = with lib; {
pkgs/development/tools/simavr/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut
1+{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut
22, avrgcc, avrlibc
33, libGLU, libGL
44, GLUT }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
2626
27− nativeBuildInputs = [ which pkgconfig avrgcc ];
27+ nativeBuildInputs = [ which pkg-config avrgcc ];
2828 buildInputs = [ libelf freeglut libGLU libGL ]
2929 ++ stdenv.lib.optional stdenv.isDarwin GLUT;
3030
pkgs/development/tools/sunxi-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }:
22
33stdenv.mkDerivation {
44 name = "sunxi-tools-20181113";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkg-config ];
1414 buildInputs = [ libusb1 zlib ];
1515
1616 makeFlags = [ "PREFIX=$(out)" ];
pkgs/development/tools/tracy/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }:
1+{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }:
22
33stdenv.mkDerivation rec {
44 pname = "tracy";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkg-config ];
1515
1616 buildInputs = [ glfw capstone ]
1717 ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ]
pkgs/development/tools/vala-lint/default.nix+2−2
@@ -4,7 +4,7 @@
44, meson
55, ninja
66, pantheon
7−, pkgconfig
7+, pkg-config
88, vala
99, gettext
1010, wrapGAppsHook
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 gettext
2626 meson
2727 ninja
28− pkgconfig
28+ pkg-config
2929 vala
3030 wrapGAppsHook
3131 ];
pkgs/development/tools/vogl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ mkDerivation, lib, fetchFromGitHub
2−, cmake, git, pkgconfig, wget, zip
2+, cmake, git, pkg-config, wget, zip
33, qtbase, qtx11extras
44, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
55, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
@@ -26,7 +26,7 @@ mkDerivation {
2626 })
2727 ];
2828
29− nativeBuildInputs = [ cmake pkgconfig ];
29+ nativeBuildInputs = [ cmake pkg-config ];
3030
3131 buildInputs = [
3232 git wget zip
pkgs/development/tools/vulkan-validation-layers/default.nix+2−2
@@ -8,7 +8,7 @@
88, vulkan-headers
99, vulkan-loader
1010, glslang
11−, pkgconfig
11+, pkg-config
1212, xlibsWrapper
1313, libxcb
1414, libXrandr
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
6565 };
6666
6767 nativeBuildInputs = [
68− pkgconfig
68+ pkg-config
6969 cmake
7070 python3
7171 ];
pkgs/development/tools/wasm-bindgen-cli/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security
1+{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security
22, runCommand
33}:
44
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
2121 '';
2222
2323 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
24− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkg-config ];
2525
2626 cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
2727 cargoBuildFlags = [ "-p" pname ];
pkgs/development/tools/wasm-pack/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv
22, fetchFromGitHub
33, rustPlatform
4−, pkgconfig
4+, pkg-config
55, libressl
66, curl
77, Security
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
2020
2121 cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s";
2222
23− nativeBuildInputs = [ pkgconfig ];
23+ nativeBuildInputs = [ pkg-config ];
2424
2525 buildInputs = [
2626 # LibreSSL works around segfault issues caused by OpenSSL being unable to
pkgs/development/tools/watchman/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre
2−, libtool, pkgconfig, openssl
2+, libtool, pkg-config, openssl
33, confFile ? config.watchman.confFile or null
44, withApple ? stdenv.isDarwin, CoreServices
55}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
1616 };
1717
18− nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
18+ nativeBuildInputs = [ autoconf automake pkg-config libtool ];
1919 buildInputs = [ pcre openssl ]
2020 ++ lib.optionals withApple [ CoreServices ];
2121
pkgs/development/web/kcgi/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, pkgconfig, fetchFromGitHub, libbsd }:
1+{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }:
22
33stdenv.mkDerivation rec {
44 pname = "kcgi";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 --replace /usr/local /
1616 '';
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
2020
2121 dontAddPrefix = true;
pkgs/development/web/nodejs/nodejs.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
2−, pkgconfig, which
2+, pkg-config, which
33# Updater dependencies
44, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
55, gnupg
@@ -28,7 +28,7 @@ let
2828 "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib"
2929 /** Closure notes: we explicitly avoid specifying --shared-*-includes,
3030 * as that would put the paths into bin/nodejs.
31− * Including pkgconfig in build inputs would also have the same effect!
31+ * Including pkg-config in build inputs would also have the same effect!
3232 */
3333 ]) (builtins.attrNames sharedLibDeps) ++ [
3434 "--with-intl=system-icu"
@@ -55,7 +55,7 @@ in
5555 buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
5656 ++ [ zlib libuv openssl http-parser icu ];
5757
58− nativeBuildInputs = [ which util-linux pkgconfig python ]
58+ nativeBuildInputs = [ which util-linux pkg-config python ]
5959 ++ optionals stdenv.isDarwin [ xcbuild ];
6060
6161 configureFlags = let
pkgs/development/web/valum/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl
1+{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl
22, libgee, libsoup, fcgi }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f";
1313 };
1414
15− nativeBuildInputs = [ meson ninja pkgconfig ];
15+ nativeBuildInputs = [ meson ninja pkg-config ];
1616 buildInputs = [ glib vala ctpl libgee libsoup fcgi ];
1717
1818 meta = with lib; {
pkgs/development/web/woff2/default.nix+2−2

This diff is too big to show here.

pkgs/games/0ad/game.nix+3−3

This diff is too big to show here.

pkgs/os-specific/linux/afuse/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/alsa-plugins/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/alsa-tools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/apparmor/default.nix+4−4

This diff is too big to show here.

pkgs/os-specific/linux/batman-adv/alfred.nix+3−3

This diff is too big to show here.

pkgs/os-specific/linux/batman-adv/batctl.nix+3−3

This diff is too big to show here.

pkgs/os-specific/linux/bluez/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/bolt/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/bpftrace/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/btfs/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/cifs-utils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/conky/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/conntrack-tools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/crda/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/criu/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/cryptsetup/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/dbus-broker/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/directvnc/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/dpdk/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/dropwatch/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ell/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/erofs-utils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/eudev/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/fbterm/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ffado/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/firmware/firmware-manager/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix+1−1

This diff is too big to show here.

pkgs/os-specific/linux/firmware/system76-firmware/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/fwts/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/guvcview/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/hal-flash/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/hostapd/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/iio-sensor-proxy/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ima-evm-utils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/intel-compute-runtime/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ipset/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/iptables/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/iputils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ipvsadm/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/irqbalance/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/iwd/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/jool/cli.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kbd/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/perf.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kmod/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kmscon/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kmscube/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/latencytop/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libatasmart/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libbpf/default.nix+3−3

This diff is too big to show here.

pkgs/os-specific/linux/libevdevc/default.nix+1−1

This diff is too big to show here.

pkgs/os-specific/linux/libfabric/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libgestures/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libnl/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libpsm2/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libratbag/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libselinux/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libsemanage/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libsmbios/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/lightum/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/lvm2/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/lxc/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/lxcfs/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/miraclecast/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/multipath-tools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/nfs-utils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/nftables/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/numatop/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/nvidia-x11/settings.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/odp-dpdk/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ofp/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/openvswitch/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/openvswitch/lts.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pam_mount/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pam_pgsql/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pam_u2f/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pam_usb/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/piper/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pktgen/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/plymouth/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pommed-light/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/powertop/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/procps-ng/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/pscircle/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/radeontools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/radeontop/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/rdma-core/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/rewritefs/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/roccat-tools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/rtkit/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/sssd/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/thunderbolt/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/udisks-glue/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/udisks/1-default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/udisks/2-default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/unstick/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/upower/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/usbguard/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/usbutils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/usermount/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/util-linux/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/uvcdynctrl/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/v4l-utils/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/wpa_supplicant/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/xf86-input-cmt/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/xf86-input-wacom/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/xf86-video-nested/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/xsensors/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/zenmonitor/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/zfs/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/solo5/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/windows/cygwin-setup/default.nix+2−2

This diff is too big to show here.

pkgs/servers/apcupsd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/asterisk/default.nix+2−2

This diff is too big to show here.

pkgs/servers/brickd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/code-server/default.nix+2−2

This diff is too big to show here.

pkgs/servers/computing/slurm/default.nix+2−2

This diff is too big to show here.

pkgs/servers/computing/torque/default.nix+2−2

This diff is too big to show here.

pkgs/servers/corosync/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/dnsdist/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/knot-dns/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/knot-resolver/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/pdns-recursor/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/powerdns/default.nix+2−2

This diff is too big to show here.

pkgs/servers/fcgiwrap/default.nix+2−2

This diff is too big to show here.

pkgs/servers/fileshare/default.nix+2−2

This diff is too big to show here.

pkgs/servers/hitch/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_ca/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_crl/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_csr/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_dnssd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_ocsp/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_pkcs12/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_scep/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_spkac/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-modules/mod_timestamp/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apt-cacher-ng/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/couchdb/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/h2o/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/lighttpd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/lwan/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/pshs/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/redstore/default.nix+2−2

This diff is too big to show here.

pkgs/servers/irc/atheme/default.nix+2−2

This diff is too big to show here.

pkgs/servers/irker/default.nix+2−2

This diff is too big to show here.

pkgs/servers/ldap/389/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mail/dovecot/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mail/exim/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mail/opensmtpd/extras.nix+3−3

This diff is too big to show here.

pkgs/servers/mail/postfix/pfixtools.nix+2−2

This diff is too big to show here.

pkgs/servers/mail/rspamd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mediatomb/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mirrorbits/default.nix+2−2

This diff is too big to show here.

pkgs/servers/misc/oven-media-engine/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/lcdproc/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/zabbix/agent.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/zabbix/proxy.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/zabbix/server.nix+2−2

This diff is too big to show here.

pkgs/servers/mumsi/default.nix+3−3

This diff is too big to show here.

pkgs/servers/neard/default.nix+2−2

This diff is too big to show here.

pkgs/servers/nosql/redis/default.nix+2−2

This diff is too big to show here.

pkgs/servers/osrm-backend/default.nix+2−2

This diff is too big to show here.

pkgs/servers/pulseaudio/default.nix+2−2

This diff is too big to show here.

pkgs/servers/pulseaudio/pali.nix+2−2

This diff is too big to show here.

pkgs/servers/quagga/default.nix+2−2

This diff is too big to show here.

pkgs/servers/rpcbind/default.nix+2−2

This diff is too big to show here.

pkgs/servers/samba/4.x.nix+2−2

This diff is too big to show here.

pkgs/servers/scylladb/default.nix+2−2

This diff is too big to show here.

pkgs/servers/search/groonga/default.nix+2−2

This diff is too big to show here.

pkgs/servers/shairplay/default.nix+2−2

This diff is too big to show here.

pkgs/servers/shairport-sync/default.nix+2−2

This diff is too big to show here.

pkgs/servers/shishi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/sip/freeswitch/default.nix+2−2

This diff is too big to show here.

pkgs/servers/sip/sipwitch/default.nix+2−2

This diff is too big to show here.

pkgs/servers/smcroute/default.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/mariadb/default.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/mysql/5.7.x.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/mysql/8.0.x.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/postgresql/default.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/postgresql/ext/pgroonga.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/postgresql/ext/postgis.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/postgresql/ext/tsearch_extras.nix+2−2

This diff is too big to show here.

pkgs/servers/squid/default.nix+2−2

This diff is too big to show here.

pkgs/servers/tang/default.nix+2−2

This diff is too big to show here.

pkgs/servers/tmate-ssh-server/default.nix+2−2

This diff is too big to show here.

pkgs/servers/ttyd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/tvheadend/default.nix+2−2

This diff is too big to show here.

pkgs/servers/uwsgi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/varnish/default.nix+2−2

This diff is too big to show here.

pkgs/servers/varnish/digest.nix+2−2

This diff is too big to show here.

pkgs/servers/varnish/dynamic.nix+2−2

This diff is too big to show here.

pkgs/servers/varnish/modules.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/fileshelter/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/sogo/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/virtlyst/default.nix+2−2

This diff is too big to show here.

pkgs/servers/x11/quartz-wm/default.nix+2−2

This diff is too big to show here.

pkgs/servers/x11/xorg/default.nix+442−442

This diff is too big to show here.

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+2−2

This diff is too big to show here.

pkgs/servers/x11/xorg/overrides.nix+4−4

This diff is too big to show here.

pkgs/servers/x11/xorg/xcb-util-xrm.nix+2−2

This diff is too big to show here.

pkgs/servers/xmpp/biboumi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/zoneminder/default.nix+2−2

This diff is too big to show here.

pkgs/tools/bluetooth/obexftp/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/curl/default.nix+2−2

This diff is too big to show here.

pkgs/top-level/aliases.nix+2

This diff is too big to show here.

pkgs/top-level/all-packages.nix+6−8

This diff is too big to show here.

pkgs/top-level/dotnet-packages.nix+2−2

This diff is too big to show here.

pkgs/top-level/emscripten-packages.nix+5−5

This diff is too big to show here.

pkgs/top-level/lua-packages.nix+2−2

This diff is too big to show here.

pkgs/top-level/perl-packages.nix+10−10

This diff is too big to show here.

pkgs/top-level/php-packages.nix+3−3

This diff is too big to show here.

pkgs/top-level/python-packages.nix+40−40

This diff is too big to show here.

pkgs/top-level/release-small.nix+1−1

This diff is too big to show here.