From 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 18 Jan 2021 22:50:56 -0800 Subject: 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. --- pkgs/applications/accessibility/contrast/default.nix | 4 ++-- pkgs/applications/accessibility/dasher/default.nix | 4 ++-- pkgs/applications/accessibility/mousetweaks/default.nix | 4 ++-- pkgs/applications/audio/a2jmidid/default.nix | 4 ++-- pkgs/applications/audio/adlplug/default.nix | 4 ++-- pkgs/applications/audio/aj-snapshot/default.nix | 4 ++-- pkgs/applications/audio/ams-lv2/default.nix | 4 ++-- pkgs/applications/audio/ario/default.nix | 4 ++-- pkgs/applications/audio/asunder/default.nix | 4 ++-- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/applications/audio/audio-recorder/default.nix | 4 ++-- pkgs/applications/audio/aumix/default.nix | 6 +++--- pkgs/applications/audio/axoloti/dfu-util.nix | 4 ++-- pkgs/applications/audio/axoloti/libusb1.nix | 4 ++-- pkgs/applications/audio/bitmeter/default.nix | 4 ++-- pkgs/applications/audio/bjumblr/default.nix | 4 ++-- pkgs/applications/audio/bristol/default.nix | 4 ++-- pkgs/applications/audio/bsequencer/default.nix | 4 ++-- pkgs/applications/audio/bshapr/default.nix | 4 ++-- pkgs/applications/audio/bslizr/default.nix | 4 ++-- pkgs/applications/audio/cadence/default.nix | 4 ++-- pkgs/applications/audio/calf/default.nix | 4 ++-- pkgs/applications/audio/cantata/default.nix | 4 ++-- pkgs/applications/audio/carla/default.nix | 4 ++-- pkgs/applications/audio/clementine/default.nix | 4 ++-- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/applications/audio/cmusfm/default.nix | 4 ++-- pkgs/applications/audio/cozy-audiobooks/default.nix | 4 ++-- pkgs/applications/audio/deadbeef/default.nix | 4 ++-- pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix | 4 ++-- pkgs/applications/audio/deadbeef/plugins/infobar.nix | 4 ++-- pkgs/applications/audio/deadbeef/plugins/lyricbar.nix | 4 ++-- pkgs/applications/audio/deadbeef/plugins/mpris2.nix | 4 ++-- pkgs/applications/audio/denemo/default.nix | 4 ++-- pkgs/applications/audio/dragonfly-reverb/default.nix | 4 ++-- pkgs/applications/audio/drumgizmo/default.nix | 4 ++-- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- pkgs/applications/audio/easytag/default.nix | 4 ++-- pkgs/applications/audio/ekho/default.nix | 4 ++-- pkgs/applications/audio/ensemble-chorus/default.nix | 4 ++-- pkgs/applications/audio/espeak-ng/default.nix | 4 ++-- pkgs/applications/audio/espeak/edit.nix | 4 ++-- pkgs/applications/audio/faust/faust1.nix | 4 ++-- pkgs/applications/audio/faust/faust2.nix | 6 +++--- pkgs/applications/audio/faust/faust2jackrust.nix | 4 ++-- pkgs/applications/audio/flacon/default.nix | 4 ++-- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- pkgs/applications/audio/fmsynth/default.nix | 4 ++-- pkgs/applications/audio/fomp/default.nix | 4 ++-- pkgs/applications/audio/foo-yc20/default.nix | 4 ++-- pkgs/applications/audio/freewheeling/default.nix | 4 ++-- pkgs/applications/audio/gigedit/default.nix | 4 ++-- pkgs/applications/audio/gjay/default.nix | 4 ++-- pkgs/applications/audio/gmpc/default.nix | 6 +++--- pkgs/applications/audio/gnome-podcasts/default.nix | 4 ++-- pkgs/applications/audio/gradio/default.nix | 4 ++-- pkgs/applications/audio/grandorgue/default.nix | 4 ++-- pkgs/applications/audio/gtkpod/default.nix | 4 ++-- pkgs/applications/audio/guitarix/default.nix | 4 ++-- pkgs/applications/audio/gxmatcheq-lv2/default.nix | 4 ++-- pkgs/applications/audio/gxplugins-lv2/default.nix | 4 ++-- pkgs/applications/audio/helio-workstation/default.nix | 4 ++-- pkgs/applications/audio/helm/default.nix | 4 ++-- pkgs/applications/audio/hybridreverb2/default.nix | 4 ++-- pkgs/applications/audio/hydrogen/0.nix | 4 ++-- pkgs/applications/audio/hydrogen/default.nix | 4 ++-- pkgs/applications/audio/iannix/default.nix | 4 ++-- pkgs/applications/audio/infamousPlugins/default.nix | 4 ++-- pkgs/applications/audio/ingen/default.nix | 4 ++-- pkgs/applications/audio/ir.lv2/default.nix | 4 ++-- pkgs/applications/audio/jack-capture/default.nix | 4 ++-- pkgs/applications/audio/jack-oscrolloscope/default.nix | 4 ++-- pkgs/applications/audio/jack-rack/default.nix | 4 ++-- pkgs/applications/audio/jackmeter/default.nix | 4 ++-- pkgs/applications/audio/jackmix/default.nix | 4 ++-- pkgs/applications/audio/jalv/default.nix | 4 ++-- pkgs/applications/audio/jamin/default.nix | 4 ++-- pkgs/applications/audio/klick/default.nix | 4 ++-- pkgs/applications/audio/klystrack/default.nix | 4 ++-- pkgs/applications/audio/kmetronome/default.nix | 4 ++-- pkgs/applications/audio/ladspa-plugins/default.nix | 4 ++-- pkgs/applications/audio/lash/default.nix | 4 ++-- pkgs/applications/audio/librespot/default.nix | 4 ++-- pkgs/applications/audio/linuxband/default.nix | 4 ++-- pkgs/applications/audio/linuxsampler/default.nix | 4 ++-- pkgs/applications/audio/lmms/default.nix | 4 ++-- pkgs/applications/audio/lollypop/default.nix | 4 ++-- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- pkgs/applications/audio/ltc-tools/default.nix | 4 ++-- pkgs/applications/audio/luppp/default.nix | 4 ++-- pkgs/applications/audio/lv2-cpp-tools/default.nix | 4 ++-- pkgs/applications/audio/lv2bm/default.nix | 4 ++-- pkgs/applications/audio/mda-lv2/default.nix | 4 ++-- pkgs/applications/audio/mellowplayer/default.nix | 4 ++-- pkgs/applications/audio/meterbridge/default.nix | 4 ++-- pkgs/applications/audio/meters_lv2/default.nix | 4 ++-- pkgs/applications/audio/mhwaveedit/default.nix | 4 ++-- pkgs/applications/audio/milkytracker/default.nix | 4 ++-- pkgs/applications/audio/mimic/default.nix | 4 ++-- pkgs/applications/audio/mixxx/default.nix | 4 ++-- pkgs/applications/audio/moc/default.nix | 4 ++-- pkgs/applications/audio/mp3info/default.nix | 4 ++-- pkgs/applications/audio/mp3splt/default.nix | 4 ++-- pkgs/applications/audio/mpc/default.nix | 4 ++-- pkgs/applications/audio/muse/default.nix | 4 ++-- pkgs/applications/audio/musescore/default.nix | 4 ++-- pkgs/applications/audio/ncmpc/default.nix | 4 ++-- pkgs/applications/audio/ncmpcpp/default.nix | 4 ++-- pkgs/applications/audio/ninjas2/default.nix | 4 ++-- pkgs/applications/audio/noise-repellent/default.nix | 4 ++-- pkgs/applications/audio/non/default.nix | 4 ++-- pkgs/applications/audio/nova-filters/default.nix | 4 ++-- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- pkgs/applications/audio/opus-tools/default.nix | 4 ++-- pkgs/applications/audio/opusfile/default.nix | 4 ++-- pkgs/applications/audio/padthv1/default.nix | 4 ++-- pkgs/applications/audio/pamix/default.nix | 4 ++-- pkgs/applications/audio/paprefs/default.nix | 4 ++-- pkgs/applications/audio/parlatype/default.nix | 4 ++-- pkgs/applications/audio/patchage/default.nix | 4 ++-- pkgs/applications/audio/paulstretch/default.nix | 4 ++-- pkgs/applications/audio/pavucontrol/default.nix | 4 ++-- pkgs/applications/audio/pianobar/default.nix | 4 ++-- pkgs/applications/audio/pithos/default.nix | 4 ++-- pkgs/applications/audio/plugin-torture/default.nix | 4 ++-- pkgs/applications/audio/polyphone/default.nix | 4 ++-- pkgs/applications/audio/ponymix/default.nix | 4 ++-- pkgs/applications/audio/praat/default.nix | 4 ++-- pkgs/applications/audio/projectm/default.nix | 4 ++-- pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 4 ++-- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- pkgs/applications/audio/qmidiroute/default.nix | 4 ++-- pkgs/applications/audio/qmmp/default.nix | 4 ++-- pkgs/applications/audio/qsampler/default.nix | 4 ++-- pkgs/applications/audio/qsynth/default.nix | 4 ++-- pkgs/applications/audio/qtscrobbler/default.nix | 4 ++-- pkgs/applications/audio/radiotray-ng/default.nix | 4 ++-- pkgs/applications/audio/rhvoice/default.nix | 4 ++-- pkgs/applications/audio/rhythmbox/default.nix | 4 ++-- pkgs/applications/audio/rosegarden/default.nix | 4 ++-- pkgs/applications/audio/samplv1/default.nix | 4 ++-- pkgs/applications/audio/seq24/default.nix | 4 ++-- pkgs/applications/audio/setbfree/default.nix | 4 ++-- pkgs/applications/audio/sfizz/default.nix | 4 ++-- pkgs/applications/audio/sfxr/default.nix | 4 ++-- pkgs/applications/audio/sidplayfp/default.nix | 4 ++-- pkgs/applications/audio/sisco.lv2/default.nix | 4 ++-- pkgs/applications/audio/snapcast/default.nix | 4 ++-- pkgs/applications/audio/snd/default.nix | 4 ++-- pkgs/applications/audio/sonic-lineup/default.nix | 4 ++-- pkgs/applications/audio/sonic-pi/default.nix | 4 ++-- pkgs/applications/audio/sooperlooper/default.nix | 4 ++-- pkgs/applications/audio/sound-juicer/default.nix | 4 ++-- pkgs/applications/audio/soundkonverter/default.nix | 4 ++-- pkgs/applications/audio/soundscape-renderer/default.nix | 4 ++-- pkgs/applications/audio/spectmorph/default.nix | 4 ++-- pkgs/applications/audio/spectrojack/default.nix | 4 ++-- pkgs/applications/audio/speech-denoiser/default.nix | 4 ++-- pkgs/applications/audio/spek/default.nix | 4 ++-- pkgs/applications/audio/spotify-tui/default.nix | 4 ++-- pkgs/applications/audio/spotifyd/default.nix | 4 ++-- pkgs/applications/audio/squishyball/default.nix | 4 ++-- pkgs/applications/audio/stone-phaser/default.nix | 4 ++-- pkgs/applications/audio/strawberry/default.nix | 4 ++-- pkgs/applications/audio/streamripper/default.nix | 4 ++-- pkgs/applications/audio/swh-lv2/default.nix | 4 ++-- pkgs/applications/audio/synthv1/default.nix | 4 ++-- pkgs/applications/audio/talentedhack/default.nix | 4 ++-- pkgs/applications/audio/timemachine/default.nix | 4 ++-- pkgs/applications/audio/tony/default.nix | 4 ++-- pkgs/applications/audio/transcode/default.nix | 4 ++-- pkgs/applications/audio/traverso/default.nix | 4 ++-- pkgs/applications/audio/uade123/default.nix | 4 ++-- pkgs/applications/audio/vcv-rack/default.nix | 4 ++-- pkgs/applications/audio/vimpc/default.nix | 4 ++-- pkgs/applications/audio/vocal/default.nix | 4 ++-- pkgs/applications/audio/vocproc/default.nix | 4 ++-- pkgs/applications/audio/vorbis-tools/default.nix | 4 ++-- pkgs/applications/audio/waon/default.nix | 4 ++-- pkgs/applications/audio/wolf-shaper/default.nix | 4 ++-- pkgs/applications/audio/x42-avldrums/default.nix | 4 ++-- pkgs/applications/audio/x42-gmsynth/default.nix | 4 ++-- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- pkgs/applications/audio/xmp/default.nix | 4 ++-- pkgs/applications/audio/xsynth-dssi/default.nix | 4 ++-- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- pkgs/applications/audio/zam-plugins/default.nix | 4 ++-- pkgs/applications/blockchains/aeon/default.nix | 4 ++-- pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++-- pkgs/applications/blockchains/bitcoin-classic.nix | 4 ++-- pkgs/applications/blockchains/bitcoin-gold.nix | 4 ++-- pkgs/applications/blockchains/bitcoin-knots.nix | 4 ++-- pkgs/applications/blockchains/bitcoin-unlimited.nix | 4 ++-- pkgs/applications/blockchains/btcdeb/default.nix | 4 ++-- pkgs/applications/blockchains/cgminer/default.nix | 4 ++-- pkgs/applications/blockchains/clightning.nix | 4 ++-- pkgs/applications/blockchains/dashpay.nix | 4 ++-- pkgs/applications/blockchains/dero.nix | 4 ++-- pkgs/applications/blockchains/digibyte.nix | 4 ++-- pkgs/applications/blockchains/dogecoin.nix | 4 ++-- pkgs/applications/blockchains/litecoin.nix | 4 ++-- pkgs/applications/blockchains/masari.nix | 4 ++-- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- pkgs/applications/blockchains/monero/default.nix | 4 ++-- pkgs/applications/blockchains/namecoin.nix | 4 ++-- pkgs/applications/blockchains/nano-wallet/default.nix | 4 ++-- pkgs/applications/blockchains/particl/particl-core.nix | 4 ++-- pkgs/applications/blockchains/pivx.nix | 4 ++-- pkgs/applications/blockchains/stellar-core.nix | 4 ++-- pkgs/applications/blockchains/vertcoin.nix | 4 ++-- pkgs/applications/editors/amp/default.nix | 4 ++-- pkgs/applications/editors/apostrophe/default.nix | 4 ++-- pkgs/applications/editors/aseprite/default.nix | 4 ++-- pkgs/applications/editors/bless/default.nix | 4 ++-- pkgs/applications/editors/bluefish/default.nix | 4 ++-- pkgs/applications/editors/codeblocks/default.nix | 4 ++-- pkgs/applications/editors/edit/default.nix | 4 ++-- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++-- pkgs/applications/editors/emacs/generic.nix | 4 ++-- pkgs/applications/editors/emacs/macport.nix | 4 ++-- pkgs/applications/editors/featherpad/default.nix | 4 ++-- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- pkgs/applications/editors/geany/default.nix | 4 ++-- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- pkgs/applications/editors/gnome-latex/default.nix | 4 ++-- pkgs/applications/editors/gobby/default.nix | 4 ++-- pkgs/applications/editors/howl/default.nix | 4 ++-- pkgs/applications/editors/jucipp/default.nix | 4 ++-- pkgs/applications/editors/kakoune/default.nix | 4 ++-- pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix | 4 ++-- pkgs/applications/editors/kdevelop5/kdevelop.nix | 4 ++-- pkgs/applications/editors/leafpad/default.nix | 4 ++-- pkgs/applications/editors/mg/default.nix | 6 +++--- pkgs/applications/editors/monodevelop/default.nix | 4 ++-- pkgs/applications/editors/neovim/default.nix | 4 ++-- pkgs/applications/editors/notepadqq/default.nix | 4 ++-- pkgs/applications/editors/quilter/default.nix | 4 ++-- pkgs/applications/editors/scite/default.nix | 4 ++-- pkgs/applications/editors/sigil/default.nix | 4 ++-- pkgs/applications/editors/supertux-editor/default.nix | 4 ++-- pkgs/applications/editors/texmacs/default.nix | 4 ++-- pkgs/applications/editors/texmaker/default.nix | 4 ++-- pkgs/applications/editors/texstudio/default.nix | 4 ++-- pkgs/applications/editors/textadept/10/default.nix | 4 ++-- pkgs/applications/editors/textadept/11/default.nix | 4 ++-- pkgs/applications/editors/tiled/default.nix | 4 ++-- pkgs/applications/editors/vim/configurable.nix | 4 ++-- pkgs/applications/editors/vim/default.nix | 4 ++-- pkgs/applications/editors/vim/macvim.nix | 4 ++-- pkgs/applications/editors/vis/default.nix | 4 ++-- pkgs/applications/gis/grass/default.nix | 4 ++-- pkgs/applications/graphics/ImageMagick/7.0.nix | 6 +++--- pkgs/applications/graphics/ImageMagick/default.nix | 12 ++++++------ pkgs/applications/graphics/ahoviewer/default.nix | 4 ++-- pkgs/applications/graphics/akira/default.nix | 4 ++-- pkgs/applications/graphics/autotrace/default.nix | 4 ++-- pkgs/applications/graphics/darktable/default.nix | 4 ++-- pkgs/applications/graphics/dia/default.nix | 4 ++-- pkgs/applications/graphics/displaycal/default.nix | 4 ++-- pkgs/applications/graphics/djview/default.nix | 4 ++-- pkgs/applications/graphics/drawing/default.nix | 4 ++-- pkgs/applications/graphics/epeg/default.nix | 4 ++-- pkgs/applications/graphics/exrdisplay/default.nix | 4 ++-- pkgs/applications/graphics/exrtools/default.nix | 4 ++-- pkgs/applications/graphics/fbida/default.nix | 4 ++-- pkgs/applications/graphics/fondo/default.nix | 4 ++-- pkgs/applications/graphics/freecad/default.nix | 4 ++-- pkgs/applications/graphics/gcolor2/default.nix | 4 ++-- pkgs/applications/graphics/geeqie/default.nix | 4 ++-- pkgs/applications/graphics/gimp/default.nix | 4 ++-- pkgs/applications/graphics/glabels/default.nix | 4 ++-- pkgs/applications/graphics/gnome-photos/default.nix | 4 ++-- pkgs/applications/graphics/gnuclad/default.nix | 4 ++-- pkgs/applications/graphics/goxel/default.nix | 4 ++-- pkgs/applications/graphics/gpicview/default.nix | 4 ++-- pkgs/applications/graphics/gqview/default.nix | 6 +++--- pkgs/applications/graphics/grafx2/default.nix | 4 ++-- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- pkgs/applications/graphics/guetzli/default.nix | 4 ++-- pkgs/applications/graphics/hugin/default.nix | 4 ++-- pkgs/applications/graphics/ideogram/default.nix | 4 ++-- pkgs/applications/graphics/imv/default.nix | 4 ++-- pkgs/applications/graphics/ipe/default.nix | 4 ++-- pkgs/applications/graphics/k3d/default.nix | 4 ++-- pkgs/applications/graphics/kgraphviewer/default.nix | 4 ++-- pkgs/applications/graphics/ktikz/default.nix | 4 ++-- pkgs/applications/graphics/luminance-hdr/default.nix | 4 ++-- pkgs/applications/graphics/mozjpeg/default.nix | 4 ++-- pkgs/applications/graphics/mypaint/default.nix | 4 ++-- pkgs/applications/graphics/nomacs/default.nix | 4 ++-- pkgs/applications/graphics/openimageio/2.x.nix | 2 +- pkgs/applications/graphics/openscad/default.nix | 4 ++-- pkgs/applications/graphics/opentoonz/default.nix | 4 ++-- pkgs/applications/graphics/photivo/default.nix | 4 ++-- pkgs/applications/graphics/photoflow/default.nix | 4 ++-- pkgs/applications/graphics/pqiv/default.nix | 4 ++-- pkgs/applications/graphics/qcomicbook/default.nix | 4 ++-- pkgs/applications/graphics/qimgv/default.nix | 4 ++-- pkgs/applications/graphics/qiv/default.nix | 4 ++-- pkgs/applications/graphics/rawtherapee/default.nix | 4 ++-- pkgs/applications/graphics/renderdoc/default.nix | 4 ++-- pkgs/applications/graphics/sane/backends/generic.nix | 4 ++-- pkgs/applications/graphics/sane/frontends.nix | 4 ++-- pkgs/applications/graphics/sane/xsane.nix | 4 ++-- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- pkgs/applications/graphics/solvespace/default.nix | 4 ++-- pkgs/applications/graphics/synfigstudio/default.nix | 6 +++--- pkgs/applications/graphics/tesseract/tesseract3.nix | 4 ++-- pkgs/applications/graphics/tesseract/tesseract4.nix | 4 ++-- pkgs/applications/graphics/viewnior/default.nix | 4 ++-- pkgs/applications/graphics/xournal/default.nix | 4 ++-- pkgs/applications/graphics/xzgv/default.nix | 4 ++-- pkgs/applications/graphics/yacreader/default.nix | 4 ++-- pkgs/applications/graphics/zgv/default.nix | 4 ++-- pkgs/applications/networking/browsers/asuka/default.nix | 4 ++-- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- pkgs/applications/networking/browsers/elinks/default.nix | 4 ++-- pkgs/applications/networking/browsers/eolie/default.nix | 4 ++-- pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++-- pkgs/applications/networking/browsers/falkon/default.nix | 4 ++-- pkgs/applications/networking/browsers/links2/default.nix | 4 ++-- pkgs/applications/networking/browsers/midori/default.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/browser.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libcss.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libdom.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libhubbub.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libnsbmp.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libnsfb.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libnsgif.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libnslog.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libnspsl.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libnsutils.nix | 4 ++-- pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix | 4 ++-- .../applications/networking/browsers/netsurf/libutf8proc.nix | 4 ++-- pkgs/applications/networking/browsers/surf/default.nix | 4 ++-- pkgs/applications/networking/browsers/vimb/default.nix | 4 ++-- pkgs/applications/networking/browsers/webbrowser/default.nix | 4 ++-- pkgs/applications/networking/compactor/default.nix | 4 ++-- pkgs/applications/networking/dropbox/cli.nix | 4 ++-- pkgs/applications/networking/linssid/default.nix | 4 ++-- pkgs/applications/networking/mpop/default.nix | 4 ++-- pkgs/applications/networking/msmtp/default.nix | 4 ++-- pkgs/applications/networking/mumble/default.nix | 4 ++-- pkgs/applications/networking/newsreaders/pan/default.nix | 4 ++-- pkgs/applications/networking/nym/default.nix | 4 ++-- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- pkgs/applications/networking/p2p/eiskaltdcpp/default.nix | 4 ++-- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- pkgs/applications/networking/p2p/ncdc/default.nix | 4 ++-- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- pkgs/applications/networking/p2p/retroshare/default.nix | 4 ++-- pkgs/applications/networking/p2p/synapse-bt/default.nix | 4 ++-- pkgs/applications/networking/p2p/torrential/default.nix | 4 ++-- pkgs/applications/networking/p2p/transgui/default.nix | 4 ++-- .../networking/p2p/transmission-remote-gtk/default.nix | 4 ++-- pkgs/applications/networking/p2p/transmission/default.nix | 4 ++-- pkgs/applications/networking/p2p/twister/default.nix | 4 ++-- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- pkgs/applications/networking/remote/putty/default.nix | 4 ++-- pkgs/applications/networking/remote/rdesktop/default.nix | 4 ++-- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- pkgs/applications/networking/remote/x2goclient/default.nix | 4 ++-- pkgs/applications/networking/remote/xrdp/default.nix | 6 +++--- pkgs/applications/networking/sniffers/etherape/default.nix | 4 ++-- pkgs/applications/networking/sniffers/ettercap/default.nix | 4 ++-- pkgs/applications/networking/sniffers/kismet/default.nix | 4 ++-- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- pkgs/applications/networking/sniproxy/default.nix | 4 ++-- pkgs/applications/networking/sync/casync/default.nix | 4 ++-- pkgs/applications/networking/sync/lsyncd/default.nix | 4 ++-- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- pkgs/applications/networking/vnstat/default.nix | 4 ++-- pkgs/applications/networking/weather/meteo/default.nix | 4 ++-- pkgs/applications/networking/znc/default.nix | 4 ++-- pkgs/applications/science/astronomy/celestia/default.nix | 4 ++-- pkgs/applications/science/astronomy/gildas/default.nix | 4 ++-- pkgs/applications/science/astronomy/gpredict/default.nix | 4 ++-- pkgs/applications/science/astronomy/xplanet/default.nix | 4 ++-- pkgs/applications/science/biology/EZminc/default.nix | 4 ++-- pkgs/applications/science/biology/exonerate/default.nix | 4 ++-- pkgs/applications/science/biology/neuron/default.nix | 4 ++-- pkgs/applications/science/biology/sortmerna/default.nix | 4 ++-- pkgs/applications/science/biology/vcftools/default.nix | 4 ++-- pkgs/applications/science/chemistry/avogadro/default.nix | 4 ++-- pkgs/applications/science/electronics/dsview/default.nix | 4 ++-- .../science/electronics/dsview/libsigrok4dsl.nix | 4 ++-- .../science/electronics/dsview/libsigrokdecode4dsl.nix | 4 ++-- pkgs/applications/science/electronics/fped/default.nix | 4 ++-- pkgs/applications/science/electronics/fritzing/default.nix | 4 ++-- pkgs/applications/science/electronics/geda/default.nix | 4 ++-- pkgs/applications/science/electronics/gerbv/default.nix | 4 ++-- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- .../science/electronics/hal-hardware-analyzer/default.nix | 4 ++-- .../applications/science/electronics/horizon-eda/default.nix | 4 ++-- pkgs/applications/science/electronics/hyp2mat/default.nix | 4 ++-- pkgs/applications/science/electronics/kicad/base.nix | 4 ++-- pkgs/applications/science/electronics/pcb/default.nix | 4 ++-- pkgs/applications/science/electronics/pulseview/default.nix | 4 ++-- pkgs/applications/science/electronics/xcircuit/default.nix | 4 ++-- pkgs/applications/science/electronics/xoscope/default.nix | 4 ++-- pkgs/applications/science/geometry/drgeo/default.nix | 4 ++-- pkgs/applications/science/logic/coq/default.nix | 4 ++-- pkgs/applications/science/logic/cvc4/default.nix | 4 ++-- pkgs/applications/science/logic/elan/default.nix | 4 ++-- pkgs/applications/science/logic/ott/default.nix | 4 ++-- pkgs/applications/science/logic/prooftree/default.nix | 4 ++-- pkgs/applications/science/logic/twelf/default.nix | 4 ++-- pkgs/applications/science/math/R/default.nix | 4 ++-- pkgs/applications/science/math/cemu/default.nix | 4 ++-- pkgs/applications/science/math/ginac/default.nix | 4 ++-- pkgs/applications/science/math/nasc/default.nix | 4 ++-- pkgs/applications/science/math/pspp/default.nix | 4 ++-- pkgs/applications/science/math/pynac/default.nix | 4 ++-- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/applications/science/math/rofi-calc/default.nix | 4 ++-- pkgs/applications/science/math/sage/default.nix | 6 +++--- pkgs/applications/science/math/singular/default.nix | 4 ++-- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- pkgs/applications/science/misc/openmodelica/default.nix | 4 ++-- pkgs/applications/science/misc/openmvg/default.nix | 4 ++-- pkgs/applications/science/misc/openmvs/default.nix | 4 ++-- pkgs/applications/science/misc/root/default.nix | 4 ++-- .../applications/science/robotics/qgroundcontrol/default.nix | 4 ++-- pkgs/applications/terminal-emulators/alacritty/default.nix | 4 ++-- pkgs/applications/terminal-emulators/eterm/default.nix | 4 ++-- pkgs/applications/terminal-emulators/evilvte/default.nix | 4 ++-- pkgs/applications/terminal-emulators/havoc/default.nix | 4 ++-- pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++-- pkgs/applications/terminal-emulators/lilyterm/default.nix | 4 ++-- pkgs/applications/terminal-emulators/lxterminal/default.nix | 4 ++-- pkgs/applications/terminal-emulators/mlterm/default.nix | 4 ++-- pkgs/applications/terminal-emulators/mrxvt/default.nix | 4 ++-- pkgs/applications/terminal-emulators/roxterm/default.nix | 4 ++-- .../rxvt-unicode-plugins/urxvt-bidi/default.nix | 4 ++-- .../applications/terminal-emulators/rxvt-unicode/default.nix | 4 ++-- pkgs/applications/terminal-emulators/rxvt/default.nix | 4 ++-- pkgs/applications/terminal-emulators/sakura/default.nix | 4 ++-- pkgs/applications/terminal-emulators/st/default.nix | 4 ++-- pkgs/applications/terminal-emulators/st/xst.nix | 4 ++-- pkgs/applications/terminal-emulators/stupidterm/default.nix | 6 +++--- pkgs/applications/terminal-emulators/termite/default.nix | 4 ++-- pkgs/applications/terminal-emulators/tilix/default.nix | 4 ++-- pkgs/applications/terminal-emulators/wayst/default.nix | 4 ++-- pkgs/applications/terminal-emulators/xterm/default.nix | 4 ++-- pkgs/applications/version-management/bitkeeper/default.nix | 4 ++-- .../version-management/git-and-tools/cgit/default.nix | 4 ++-- .../version-management/git-and-tools/git-dit/default.nix | 4 ++-- .../version-management/git-and-tools/git-gone/default.nix | 4 ++-- .../version-management/git-and-tools/git-ignore/default.nix | 4 ++-- .../git-and-tools/git-workspace/default.nix | 4 ++-- .../version-management/git-and-tools/git/default.nix | 4 ++-- .../version-management/git-and-tools/gitin/default.nix | 4 ++-- .../version-management/git-and-tools/grv/default.nix | 4 ++-- .../version-management/git-and-tools/tig/default.nix | 4 ++-- .../version-management/gitlab/gitaly/default.nix | 4 ++-- pkgs/applications/version-management/gitoxide/default.nix | 2 +- pkgs/applications/version-management/gource/default.nix | 4 ++-- pkgs/applications/version-management/guitone/default.nix | 4 ++-- .../applications/version-management/monotone-viz/default.nix | 6 +++--- .../version-management/monotone-viz/graphviz-2.0.nix | 4 ++-- pkgs/applications/version-management/monotone/default.nix | 4 ++-- pkgs/applications/window-managers/afterstep/default.nix | 6 +++--- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- pkgs/applications/window-managers/cwm/default.nix | 4 ++-- pkgs/applications/window-managers/dwm/dwm-status.nix | 4 ++-- pkgs/applications/window-managers/dzen2/default.nix | 4 ++-- pkgs/applications/window-managers/fbpanel/default.nix | 4 ++-- pkgs/applications/window-managers/fluxbox/default.nix | 4 ++-- pkgs/applications/window-managers/fvwm/default.nix | 4 ++-- pkgs/applications/window-managers/herbstluftwm/default.nix | 4 ++-- pkgs/applications/window-managers/hikari/default.nix | 4 ++-- pkgs/applications/window-managers/i3/easyfocus.nix | 4 ++-- pkgs/applications/window-managers/i3/i3ipc-glib.nix | 4 ++-- pkgs/applications/window-managers/i3/lock-color.nix | 4 ++-- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- pkgs/applications/window-managers/i3/status-rust.nix | 4 ++-- pkgs/applications/window-managers/i3/status.nix | 4 ++-- pkgs/applications/window-managers/i3/wmfocus.nix | 4 ++-- pkgs/applications/window-managers/jwm/default.nix | 4 ++-- .../window-managers/jwm/jwm-settings-manager.nix | 4 ++-- pkgs/applications/window-managers/kbdd/default.nix | 4 ++-- pkgs/applications/window-managers/matchbox/default.nix | 4 ++-- pkgs/applications/window-managers/neocomp/default.nix | 4 ++-- pkgs/applications/window-managers/notion/default.nix | 4 ++-- pkgs/applications/window-managers/openbox/default.nix | 4 ++-- pkgs/applications/window-managers/oroborus/default.nix | 4 ++-- pkgs/applications/window-managers/qtile/default.nix | 4 ++-- pkgs/applications/window-managers/ratpoison/default.nix | 4 ++-- pkgs/applications/window-managers/spectrwm/default.nix | 4 ++-- pkgs/applications/window-managers/sway/bg.nix | 4 ++-- pkgs/applications/window-managers/sway/idle.nix | 4 ++-- pkgs/applications/window-managers/sway/lock-effects.nix | 4 ++-- pkgs/applications/window-managers/sway/lock.nix | 4 ++-- pkgs/applications/window-managers/trayer/default.nix | 4 ++-- pkgs/applications/window-managers/vwm/default.nix | 4 ++-- pkgs/applications/window-managers/windowlab/default.nix | 4 ++-- pkgs/applications/window-managers/windowmaker/default.nix | 4 ++-- .../window-managers/windowmaker/dockapps/wmsystemtray.nix | 4 ++-- pkgs/applications/window-managers/wmii-hg/default.nix | 4 ++-- .../window-managers/xmonad/log-applet/default.nix | 4 ++-- pkgs/applications/window-managers/yabar/build.nix | 4 ++-- 503 files changed, 1020 insertions(+), 1020 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 1d18f4a92302..2899d4ea6efa 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -10,7 +10,7 @@ , meson , ninja , pango -, pkgconfig +, pkg-config , python3 , rustc , rustPlatform @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook glib # for glib-compile-resources diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 43844d0c66bb..fe0d8fe86346 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, autoreconfHook, pkgconfig, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook , glib, gtk3, expat, gnome-doc-utils, which , at-spi2-core, dbus , libxslt, libxml2 @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook wrapGAppsHook - pkgconfig + pkg-config # doc generation gnome-doc-utils which diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index e1449131f166..2ff36bb68333 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gtk3 gsettings-desktop-schemas diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 35c9cda1821c..4f76178a29d0 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; }; - nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; buildInputs = [ alsaLib dbus libjack2 ] ++ (with python3Packages; [ python dbus-python ]); diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index cdf9e3e538ee..ecc429de6b2b 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig fmt ]; + nativeBuildInputs = [ cmake pkg-config fmt ]; meta = with lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index e4a196d0f6bf..636314bf1cac 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = false; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib minixml jack2Full ]; meta = with lib; { diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 99c3ca736076..88956a190c4a 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig +{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config , wafHook, python3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with lib; { diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index c4a7829157d1..896f93619478 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool, wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, libsoup, avahi, taglib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; - nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib ]; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 2e849912edb0..c3cba87e300c 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia +{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkg-config, cdparanoia , mp3Support ? false, lame , oggSupport ? true, vorbis-tools , flacSupport ? true, flac @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; }; - nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; + nativeBuildInputs = [ intltool makeWrapper pkg-config ]; buildInputs = [ gtk2 libcddb ]; runtimeDeps = diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index c441a2f9f3f1..82a2303e26b3 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkgconfig, + gettext, pkg-config, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ # Core dependencies diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index c1701671bee0..6a4abbbdf534 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, intltool +, pkg-config, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 , librsvg, wrapGAppsHook , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # https://bugs.launchpad.net/audio-recorder/+bug/1784622 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ glib dbus gtk3 librsvg libappindicator-gtk3 diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index ffda8b6734d6..b1808ed90f11 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,9 +1,9 @@ {lib, stdenv, fetchurl, gettext, ncurses , gtkGUI ? false -, pkgconfig ? null +, pkg-config ? null , gtk2 ? null}: -assert gtkGUI -> pkgconfig != null && gtk2 != null; +assert gtkGUI -> pkg-config != null && gtk2 != null; stdenv.mkDerivation rec { name = "aumix-2.9.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkgconfig gtk2] else []); + ++ (if gtkGUI then [pkg-config gtk2] else []); meta = { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index 4b4b5ce56780..a8a2f8813af8 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, pkgconfig, libusb1-axoloti }: +{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.8"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1-axoloti ]; src = fetchurl { diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index f00167026b4a..b6c2a1b1ae6e 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkg-config, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - buildInputs = [ pkgconfig ]; + buildInputs = [ pkg-config ]; propagatedBuildInputs = lib.optional stdenv.isLinux systemd ++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index ebea6251dfb0..6108d84c3d9a 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: +{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "bitmeter"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libjack2 gtk2 ]; patches = [ diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index cc6df2328e07..104c795c11e7 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: +{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "BJumblr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 cairo lv2 libsndfile ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index d58ff73bb70a..e86341a608e3 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }: stdenv.mkDerivation rec { pname = "bristol"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xorgproto diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index 93e010d826dc..d45b42ddb9fa 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BSEQuencer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index e4f96e396c9b..7e45d6a826f9 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BShapr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index c833bd1262b1..d307307fd1d4 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BSlizr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index b94e8d2e6f2f..d71420d07227 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -6,7 +6,7 @@ , fetchpatch , fetchzip , jack_capture -, pkgconfig +, pkg-config , pulseaudioFull , qtbase , makeWrapper @@ -48,7 +48,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 8fecd558e678..bdcbf024e606 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk2, libjack2, ladspaH , libglade, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "calf"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH - libglade lv2 pkgconfig + libglade lv2 pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index bbdcbc21b789..8f02e8da8934 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtsvg, qttools, perl # Cantata doesn't build with cdparanoia enabled so we disable that @@ -73,7 +73,7 @@ in mkDerivation { ++ lib.optional withUdisks udisks2 ++ lib.optional withLibVlc libvlc; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 3800e351fab9..a4b68707ee7c 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, - liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, + liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withGtk2 ? true, gtk2 ? null, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python3Packages.wrapPython pkgconfig which wrapQtAppsHook + python3Packages.wrapPython pkg-config which wrapQtAppsHook ]; pythonPath = with python3Packages; [ diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b7b42b0aa7df..12aec0d4cbbc 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -2,7 +2,7 @@ , qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf -, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: +, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }: let withIpod = config.clementine.ipod or false; @@ -24,7 +24,7 @@ let ./clementine-spotify-blob.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index e573c7c14b19..2193b359e688 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 307e06602e7a..79f78452c4ca 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { version = "2020-07-23"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; # building configureFlags = [ "--enable-libnotify" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl libnotify gdk-pixbuf ]; meta = with lib; { diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index a30d604e3465..e78e50877d37 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , ninja , meson -, pkgconfig +, pkg-config , wrapGAppsHook , appstream-glib , desktop-file-utils @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - meson ninja pkgconfig + meson ninja pkg-config wrapGAppsHook appstream-glib desktop-file-utils diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 800458e7925a..9eda63331128 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -3,7 +3,7 @@ , automake , libtool , intltool -, pkgconfig +, pkg-config , jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig + pkg-config ] ++ lib.optional gtk3Support wrapGAppsHook; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index 819192fc1d4a..16cefc5ff85a 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { pname = "deadbeef-headerbar-gtk3-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config libxml2 ]; buildInputs = [ deadbeef glib gtk3 ]; # Choose correct installation path diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index d5894e2fdbc3..3f62e73e7e46 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { pname = "deadbeef-infobar-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtk3 libxml2 ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index ad388e23d9f9..bc6d206956f0 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }: stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtkmm3 libxmlxx3 ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 7bc0a4d1fa6f..d0c1b4f9e500 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, deadbeef, glib }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }: stdenv.mkDerivation rec { pname = "deadbeef-mpris2-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef glib ]; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index ea152b59a507..4abaec8dadd9 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjack2, gettext, intltool, guile_2_0, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gettext - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 0ada1dfeaa6f..4f3d2a6a4dcd 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "dragonfly-reverb"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchShebangs dpf/utils/generate-ttl.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 xorg.libX11 libGL ]; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index f69e101877bc..dfaf7127f4bc 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng -, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler +, libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs - libsmf libsndfile lv2 pkgconfig zita-resampler + libsmf libsndfile lv2 pkg-config zita-resampler ]; meta = with lib; { diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 82a47b8173a2..c175804a026b 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: mkDerivation rec { pname = "drumkv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 6f5431cf1d84..65c871640ef5 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrap